You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/18 12:32:12 UTC

git commit: updated refs/heads/master to 59e6596

Repository: cloudstack
Updated Branches:
  refs/heads/master ba5b6b152 -> 59e6596fe


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

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

This closes #479


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

Branch: refs/heads/master
Commit: 59e6596fefe55b56d414b1c4a8a665153aba1035
Parents: ba5b6b1
Author: Jayapal <ja...@apache.org>
Authored: Wed Jun 17 15:16:54 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Jun 18 13:32:00 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/59e6596f/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index d195f53..0dfa6da 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -927,10 +927,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: