cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.5 to 259b263
Date Thu, 18 Jun 2015 10:33:34 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 85e2d9611 -> 259b2639f


Fixed issue in adding vm SG rules on vm reboot for xenserver 6.5

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #479

(cherry picked from commit 59e6596fefe55b56d414b1c4a8a665153aba1035)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/259b2639
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/259b2639
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/259b2639

Branch: refs/heads/4.5
Commit: 259b2639f5c31950d7f480a41a19f710a6f1ae3b
Parents: 85e2d96
Author: Jayapal <jayapal@apache.org>
Authored: Wed Jun 17 15:16:54 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Jun 18 13:33:01 2015 +0300

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/vmops | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/259b2639/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index e5e5c40..b5ac17f 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -938,10 +938,9 @@ def network_rules_for_rebooted_vm(session, vmName):
         for cmd in [delcmd, delcmd2, inscmd, inscmd2, inscmd3, inscmd4]:
             cmds = util.pread2(['/bin/bash', '-c', cmd]).split('\n')
             cmds.pop()
-            for c in cmds:
+            for c in filter(None,cmds):
                     ipt = c.split(' ')
                     ipt.insert(0, 'iptables')
-                    ipt.pop()
                     ipts.append(ipt)
 
         for ipt in ipts:


Mime
View raw message