openstack/charm-neutron-gateway
Code Issues Proposed changes

NeutronGatewayContext inherits NeutronAPIContext

Browse Source
This commit is contained in:
David Ames 2015-10-08 12:12:34 -07:00
parent 655d0d04e2
commit 9f0b502f26
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_contexts.py
View File

@ -121,10 +121,10 @@ class L3AgentContext(OSContextGenerator):
return ctxt return ctxt
class NeutronGatewayContext(OSContextGenerator): class NeutronGatewayContext(NeutronAPIContext):
def __call__(self): def __call__(self):
api_settings = NeutronAPIContext()() api_settings = super(NeutronGatewayContext, self).__call__()
ctxt = { ctxt = {
'shared_secret': get_shared_secret(), 'shared_secret': get_shared_secret(),
'local_ip': 'local_ip':

6
hooks/neutron_utils.py
View File

@ -445,13 +445,11 @@ NEUTRON_OVS_CONFIG_FILES = {
'services': ['neutron-l3-agent', 'neutron-vpn-agent'] 'services': ['neutron-l3-agent', 'neutron-vpn-agent']
}, },
NEUTRON_OVS_PLUGIN_CONF: { NEUTRON_OVS_PLUGIN_CONF: {
'hook_contexts': [NeutronGatewayContext(), 'hook_contexts': [NeutronGatewayContext()],
NeutronAPIContext()],
'services': ['neutron-plugin-openvswitch-agent'] 'services': ['neutron-plugin-openvswitch-agent']
}, },
NEUTRON_ML2_PLUGIN_CONF: { NEUTRON_ML2_PLUGIN_CONF: {
'hook_contexts': [NeutronGatewayContext(), 'hook_contexts': [NeutronGatewayContext()],
NeutronAPIContext()],
'services': ['neutron-plugin-openvswitch-agent'] 'services': ['neutron-plugin-openvswitch-agent']
}, },
EXT_PORT_CONF: { EXT_PORT_CONF: {