openstack/charm-neutron-gateway
Code Issues Proposed changes

Fix more.

Browse Source
This commit is contained in:
Hui Xiang 2014-12-16 16:47:40 +08:00
parent 52f27b1c38
commit 5ff6b7104f
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/monitor.py
View File

@ -256,7 +256,7 @@ class MonitorNeutronAgentsDaemon(Daemon):
LOG.info('Active l3 agents: %s' % l3_agents) LOG.info('Active l3 agents: %s' % l3_agents)
if not networks and not routers: if not networks and not routers:
LOG.info('No failed agents found, return.') LOG.info('No networks and routers hosted on failed agents.')
return return
if len(dhcp_agents) == 0 and len(l3_agents) == 0: if len(dhcp_agents) == 0 and len(l3_agents) == 0:
@ -273,10 +273,10 @@ class MonitorNeutronAgentsDaemon(Daemon):
def run(self): def run(self):
while True: while True:
LOG.info('Monitor Neutron Agent Loop Start') LOG.info('Monitor Neutron HA Agent Loop Start')
self.reassign_agent_resources()
LOG.info('sleep %s' % cfg.CONF.check_interval) LOG.info('sleep %s' % cfg.CONF.check_interval)
time.sleep(float(cfg.CONF.check_interval)) time.sleep(float(cfg.CONF.check_interval))
self.reassign_agent_resources()
if __name__ == '__main__': if __name__ == '__main__':

4
files/monitor_neutron_ha.sh
View File

@ -1,10 +1,10 @@
#! /bin/bash #! /bin/bash
logger " ** " logger " ******************************************************************* "
logger "Start running ns_ovs_cleanup.sh..." logger "Start running ns_ovs_cleanup.sh..."
logger "CRM_notify_task: $CRM_notify_task, CRM_notify_desc: $CRM_notify_desc" logger "CRM_notify_task: $CRM_notify_task, CRM_notify_desc: $CRM_notify_desc"
logger "CRM_notify_rsc: $CRM_notify_rsc, CRM_notify_node: $CRM_notify_node" logger "CRM_notify_rsc: $CRM_notify_rsc, CRM_notify_node: $CRM_notify_node"
logger " ** " logger " ******************************************************************* "
set -x set -x
DEFAULT_PIDFILE="/tmp/monitor.pid" DEFAULT_PIDFILE="/tmp/monitor.pid"

9
hooks/quantum_utils.py
View File

@ -629,13 +629,6 @@ def copy_file(source_dir, des_dir, f, f_mod=None, update=False):
raise raise
def init_ocf_MonitorNeutron_f(update=False):
ocf_f = 'MonitorNeutron'
exec_dir = '/usr/lib/ocf/resource.d/pacemaker'
copy_file(LEGACY_HA_TEMPLATE_FILES, exec_dir,
ocf_f, stat.S_IEXEC, update=update)
def get_external_agent_f(): def get_external_agent_f():
agent = 'monitor_neutron_ha.sh' agent = 'monitor_neutron_ha.sh'
exec_dir = '/usr/lib/ocf/resource.d/canonical' exec_dir = '/usr/lib/ocf/resource.d/canonical'
@ -665,9 +658,9 @@ def init_monitor_conf_files(update=False):
def install_legacy_ha_files(update=False): def install_legacy_ha_files(update=False):
if config('ha-legacy-mode'): if config('ha-legacy-mode'):
init_ocf_MonitorNeutron_f(update=update)
init_external_agent_f(update=update) init_external_agent_f(update=update)
init_monitor_daemon(update=update) init_monitor_daemon(update=update)
init_monitor_conf_files()
def cache_env_data(): def cache_env_data():