openstack
/
charm-neutron-gateway
Code Issues Proposed changes

Add cleanup upstart configuration for HA

This commit is contained in:
James Page 2013-02-13 08:57:07 +00:00
parent cb7747ddcb
commit f108fe5e4a
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/quantum-cleanup.conf Normal file
View File

@ -0,0 +1,8 @@
description "Cleanup Quantum DHCP and L3 configuration"
author "James Page <james.page@ubuntu.com"
post-stop script
if [ -x /usr/bin/quantum-netns-cleanup ]; then
/usr/bin/quantum-netns-cleanup --force || true
fi
end script

22
hooks/hooks.py
View File

@ -4,12 +4,20 @@ import utils
import sys
import quantum_utils as qutils
import os
import glob
import shutil
PLUGIN = utils.config_get('plugin')
def install_upstart_scripts():
for x in glob.glob('files/*.conf'):
shutil.copy(x, '/etc/init/')
def install():
utils.configure_source()
install_upstart_scripts()
if PLUGIN in qutils.GATEWAY_PKGS.keys():
if PLUGIN == qutils.OVS:
# Install OVS DKMS first to ensure that the ovs module
@ -247,17 +255,23 @@ def ha_relation_joined():
# Used when resources have upstart jobs that are needed to be disabled.
# resource_name:init_script_name
init_services = {'res_quantum_dhcp_agent': 'quantum-dhcp-agent',
'res_quantum_l3_agent': 'quantum-l3-agent'}
'res_quantum_l3_agent': 'quantum-l3-agent',
'res_quantum_cleanup': 'quantum-cleanup'}
# Obtain resources
resources = {'res_quantum_dhcp_agent': 'upstart:quantum-dhcp-agent',
'res_quantum_l3_agent': 'upstart:quantum-l3-agent'}
'res_quantum_l3_agent': 'upstart:quantum-l3-agent',
'res_quantum_cleanup': 'upstart:quantum-cleanup'}
resource_params = {'res_quantum_dhcp_agent':
'op monitor interval="5s"',
'res_quantum_l3_agent':
'op monitor interval="5s"',
'res_quantum_cleanup':
'op monitor interval="5s"'}
groups = {RESOURCE_GROUP:
'res_quantum_dhcp_agent res_quantum_l3_agent'}
groups = {
RESOURCE_GROUP:
'res_quantum_dhcp_agent res_quantum_l3_agent res_quantum_cleanup'
}
# set relation values
utils.relation_set(resources=resources,
resource_params=resource_params,

2
revision
View File

@ -1 +1 @@
51
52