cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 850c07c
Date Wed, 08 Mar 2017 10:46:50 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 40e49a626 -> 850c07cc8


CLOUDSTACK-9821: Fixed issue in deploying vm in basic zone


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

Branch: refs/heads/master
Commit: 43a991d2ebc613957c9909e0dca80d991fe20e16
Parents: 61ce75e
Author: Jayapal <jayapal.uradi@accelerite.com>
Authored: Mon Mar 6 19:01:15 2017 +0530
Committer: Jayapal <jayapal.uradi@accelerite.com>
Committed: Mon Mar 6 19:01:15 2017 +0530

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/vmops | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43a991d2/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 46aeffa..93d2af2 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -1267,19 +1267,19 @@ def cache_ipset_keyword():
     type = getIpsetType()
     tmpname = 'ipsetqzvxtmp'
     try:
-        util.pread2(['/bin/bash', '-c', 'ipset -N ' + tmpname + type])
+        util.pread2(['ipset', '-N', tmpname, type])
     except:
-        util.pread2(['/bin/bash', '-c', 'ipset -F ' + tmpname])
+        util.pread2(['ipset', '-F', tmpname])
 
     try:
-        util.pread2(['/bin/bash', '-c', 'iptables -A INPUT -m set --set ' + tmpname + ' src'
+ ' -j ACCEPT'])
-        util.pread2(['/bin/bash', '-c', 'iptables -D INPUT -m set --set ' + tmpname + ' src'
+ ' -j ACCEPT'])
+        util.pread2(['iptables -A INPUT -m set --set ' + tmpname + ' src' + ' -j ACCEPT'])
+        util.pread2(['iptables -D INPUT -m set --set ' + tmpname + ' src' + ' -j ACCEPT'])
         keyword = 'set'
     except:
         keyword = 'match-set'
 
     try:
-       util.pread2(['/bin/bash', '-c', 'ipset -X ' + tmpname])
+       util.pread2(['ipset', '-X', tmpname])
     except:
        pass
 


Mime
View raw message