openstack/charm-neutron-api
Code Issues Proposed changes

Add restart trigger support

Browse Source
This commit is contained in:
Liam Young 2015-06-11 16:48:46 +00:00
parent f54243db7e
commit b619f1cc68
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/neutron_api_context.py
View File

@ -254,6 +254,10 @@ class NeutronApiSDNContext(context.OSContextGenerator):
'templ_key': 'service_plugins', 'templ_key': 'service_plugins',
'value': 'router,firewall,lbaas,vpnaas,metering', 'value': 'router,firewall,lbaas,vpnaas,metering',
}, },
'restart-trigger': {
'templ_key': 'restart_trigger',
'value': '',
},
} }
for rid in relation_ids('neutron-test'): for rid in relation_ids('neutron-test'):
for unit in related_units(rid): for unit in related_units(rid):
@ -270,7 +274,6 @@ class NeutronApiSDNContext(context.OSContextGenerator):
ctxt[ctxt_key] = remote_value ctxt[ctxt_key] = remote_value
else: else:
ctxt[ctxt_key] = defaults[key]['value'] ctxt[ctxt_key] = defaults[key]['value']
print ctxt
return ctxt return ctxt
return ctxt return ctxt
@ -289,7 +292,6 @@ class NeutronApiSDNConfigFileContext(context.OSContextGenerator):
for unit in related_units(rid): for unit in related_units(rid):
rdata = relation_get(rid=rid, unit=unit) rdata = relation_get(rid=rid, unit=unit)
neutron_server_plugin_config = rdata.get('neutron-plugin-config') neutron_server_plugin_config = rdata.get('neutron-plugin-config')
print neutron_server_plugin_config
if neutron_server_plugin_config: if neutron_server_plugin_config:
return { 'config': neutron_server_plugin_config } return { 'config': neutron_server_plugin_config }
return { 'config': '/etc/neutron/plugins/ml2/ml2_conf.ini' } return { 'config': '/etc/neutron/plugins/ml2/ml2_conf.ini' }