openstack/charm-neutron-gateway
Code Issues Proposed changes

Fix error in check_local_agents

Browse Source
This commit is contained in:
Hui Xiang 2015-01-19 14:54:42 +08:00
parent 9e86bbd1a2
commit ecab2c6aab
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/neutron-ha-monitor.py
View File

@ -362,7 +362,7 @@ class MonitorNeutronAgentsDaemon(Daemon):
conf = agent['configurations']
if 'gre' in conf['tunnel_types'] and conf['l2_population'] \
and conf['devices']:
LOG.warning('local ovs agent:%s' % agent)
LOG.debug('local ovs agent:%s' % agent)
ovs_output = subprocess.check_output(['ovs-vsctl',
'list-ports', 'br-tun'])
ports = ovs_output.strip().split('\n')
@ -388,15 +388,17 @@ class MonitorNeutronAgentsDaemon(Daemon):
status = ['sudo', 'service', s, 'status']
restart = ['sudo', 'service', s, 'restart']
start = ['sudo', 'service', s, 'start']
stop = 'neutron-vpn-agent stop/waiting'
stop = '%s stop/waiting' % s
try:
output = subprocess.check_output(status)
if output.strip() == stop:
subprocess.check_output(start)
LOG.error('Restart service: %s' % s)
if s == 'neutron-metadata-agent':
subprocess.check_output(['sudo', 'service',
'neutron-vpn-agent',
'restart'])
LOG.error('Restart neutron-vpn-agent')
except subprocess.CalledProcessError:
LOG.error('Restart service: %s' % s)
subprocess.check_output(restart)