openstack/charm-neutron-gateway
Code Issues Proposed changes

Fix a bit

Browse Source
This commit is contained in:
Hui Xiang 2014-12-17 14:19:16 +08:00
parent ad0c8f8747
commit 8dbb3d6358
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/monitor.py
View File

@ -123,7 +123,7 @@ class MonitorNeutronAgentsDaemon(Daemon):
def get_root_helper(self): def get_root_helper(self):
return 'sudo' return 'sudo'
def unplug_device(self, conf, device): def unplug_device(self, device):
try: try:
device.link.delete() device.link.delete()
except RuntimeError: except RuntimeError:
@ -143,9 +143,9 @@ class MonitorNeutronAgentsDaemon(Daemon):
for network, agent in networks.iteritems(): for network, agent in networks.iteritems():
namespaces.append('qdhcp-' + network) namespaces.append('qdhcp-' + network)
else: else:
cmd = ['sudo', 'ip', 'netns', '|', 'grep', 'qdhcp'] cmd = 'sudo ip netns | grep qdhcp'
try: try:
qns = subprocess.call(cmd).strip().split(' ') qns = subprocess.check_output(cmd, True).strip().split(' ')
for qn in qns: for qn in qns:
namespaces.append(qn) namespaces.append(qn)
except Exception: except Exception:
@ -161,9 +161,9 @@ class MonitorNeutronAgentsDaemon(Daemon):
for router, agent in routers.iteritems(): for router, agent in routers.iteritems():
namespaces.append('qrouter-' + router) namespaces.append('qrouter-' + router)
else: else:
cmd = ['sudo', 'ip', 'netns', '|', 'grep', 'qrouter'] cmd = 'sudo ip netns | grep qrouter'
try: try:
qns = subprocess.call(cmd).strip().split(' ') qns = subprocess.check_output(cmd, True).strip().split(' ')
for qn in qns: for qn in qns:
namespaces.append(qn) namespaces.append(qn)
except Exception: except Exception: