openstack
/
charm-neutron-api
Code Issues Proposed changes

Update relation name

This commit is contained in:
Liam Young 2015-06-12 12:23:29 +00:00
parent 7a2fa1b185
commit d835d0c9e5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hooks/neutron_api_context.py
View File

@ -237,10 +237,10 @@ class HAProxyContext(context.HAProxyContext):
class NeutronApiSDNContext(context.SubordinateConfigContext):
interfaces = 'neutron-test'
interfaces = 'neutron-plugin-api-subordinate'
def __init__(self):
super(NeutronApiSDNContext, self).__init__(interface='neutron-test',
super(NeutronApiSDNContext, self).__init__(interface='neutron-plugin-api-subordinate',
service='neutron-api',
config_file='/etc/neutron/neutron.conf')
@ -264,7 +264,7 @@ class NeutronApiSDNContext(context.SubordinateConfigContext):
'value': '',
},
}
for rid in relation_ids('neutron-test'):
for rid in relation_ids('neutron-plugin-api-subordinate'):
for unit in related_units(rid):
rdata = relation_get(rid=rid, unit=unit)
ctxt['neutron_plugin'] = rdata.get('neutron-plugin')
@ -281,7 +281,7 @@ class NeutronApiSDNContext(context.SubordinateConfigContext):
return ctxt
class NeutronApiSDNConfigFileContext(context.OSContextGenerator):
interfaces = ['neutron-test']
interfaces = ['neutron-plugin-api-subordinate']
def __call__(self):
ctxt = {}
@ -291,7 +291,7 @@ class NeutronApiSDNConfigFileContext(context.OSContextGenerator):
'value': '/etc/neutron/plugins/ml2/ml2_conf.ini',
},
}
for rid in relation_ids('neutron-test'):
for rid in relation_ids('neutron-plugin-api-subordinate'):
for unit in related_units(rid):
rdata = relation_get(rid=rid, unit=unit)
neutron_server_plugin_config = rdata.get('neutron-plugin-config')

4
metadata.yaml
View File

@ -40,8 +40,8 @@ requires:
neutron-plugin:
interface: neutron-plugin
scope: container
neutron-test:
interface: neutron-test
neutron-plugin-api-subordinate:
interface: neutron-plugin-api-subordinate
scope: container
peers:
cluster: