openstack/charm-neutron-gateway
Code Issues Proposed changes

Enable LBAAS agent

Browse Source
This commit is contained in:
James Page 2014-03-27 22:35:15 +00:00
parent 118ea2b600
commit 2826f57693
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/quantum_utils.py
View File

@ -96,7 +96,8 @@ NEUTRON_GATEWAY_PKGS = {
'python-mysqldb',
'python-oslo.config', # Force upgrade
"nova-api-metadata",
"neutron-plugin-metering-agent"
"neutron-plugin-metering-agent",
"neutron-lbaas-agent"
],
NVP: [
"neutron-dhcp-agent",
@ -150,6 +151,7 @@ NEUTRON_DHCP_AGENT_CONF = "/etc/neutron/dhcp_agent.ini"
NEUTRON_DNSMASQ_CONF = "/etc/neutron/dnsmasq.conf"
NEUTRON_METADATA_AGENT_CONF = "/etc/neutron/metadata_agent.ini"
NEUTRON_METERING_AGENT_CONF = "/etc/neutron/metering_agent.ini"
NEUTRON_LBAAS_AGENT_CONF = "/etc/neutron/lbaas_agent.ini"
NOVA_CONF_DIR = '/etc/nova'
NOVA_CONF = "/etc/nova/nova.conf"
@ -227,7 +229,8 @@ NEUTRON_OVS_CONFIG_FILES = {
'neutron-dhcp-agent',
'neutron-metadata-agent',
'neutron-plugin-openvswitch-agent',
'neutron-metering-agent']
'neutron-metering-agent',
'neutron-lbaas-agent']
},
NEUTRON_L3_AGENT_CONF: {
'hook_contexts': [NetworkServiceContext(),
@ -239,6 +242,10 @@ NEUTRON_OVS_CONFIG_FILES = {
'hook_contexts': [QuantumGatewayContext()],
'services': ['neutron-metering-agent']
},
NEUTRON_LBAAS_AGENT_CONF: {
'hook_contexts': [QuantumGatewayContext()],
'services': ['neutron-lbaas-agent']
},
NEUTRON_OVS_PLUGIN_CONF: {
'hook_contexts': [QuantumGatewayContext()],
'services': ['neutron-plugin-openvswitch-agent']

5
unit_tests/test_quantum_utils.py
View File

@ -158,6 +158,8 @@ class TestQuantumUtils(CharmTestCase):
quantum_utils.NEUTRON_L3_AGENT_CONF: ['neutron-l3-agent'],
quantum_utils.NEUTRON_METERING_AGENT_CONF:
['neutron-metering-agent'],
quantum_utils.NEUTRON_LBAAS_AGENT_CONF:
['neutron-lbaas-agent'],
quantum_utils.NEUTRON_OVS_PLUGIN_CONF:
['neutron-plugin-openvswitch-agent'],
quantum_utils.NOVA_CONF: ['nova-api-metadata'],
@ -169,7 +171,8 @@ class TestQuantumUtils(CharmTestCase):
'neutron-dhcp-agent',
'neutron-metadata-agent',
'neutron-plugin-openvswitch-agent',
'neutron-metering-agent']
'neutron-metering-agent',
'neutron-lbaas-agent']
}
self.assertEquals(quantum_utils.restart_map(), ex_map)