etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

security_group: Use execute() function instead of non-existing bash() (#2732) 

In 6233a77d15 as a part of PR #2432 the
bash() function was replaced by the execute() function.

Somehow this last calling of the bash() function was not caught by testing
and is still in there.

This causes Exceptions to be thrown by the Security Group script.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
This commit is contained in:
Wido den Hollander 2018-07-20 09:07:29 +02:00 committed by dahn
parent a6e0204ccc
commit 1ccb32f814
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/vm/network/security_group.py
View File

@ -61,7 +61,7 @@ def execute(cmd):
try:
return check_output(cmd, shell=True)
except CalledProcessError as e:
logging.exception('Failed to execute: %s', e.cmd)
pass
def can_bridge_firewall(privnic):
@ -1151,8 +1151,8 @@ def getvmId(vmName):
def getBrfw(brname):
cmd = "iptables-save |grep physdev-is-bridged |grep FORWARD |grep BF |grep '\-o' | grep -w " + brname + "|awk '{print $9}' | head -1"
brfwname = bash("-c", cmd).stdout.strip()
if brfwname == "":
brfwname = execute(cmd).strip()
if not brfwname:
brfwname = "BF-" + brname
return brfwname