x
/
charm-neutron-api-plumgrid
Code Issues Proposed changes

Commit

This commit is contained in:
Bilal Baqar 2016-03-07 21:43:36 -08:00
parent 0ce5c478b2
commit dd347e0f22
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hooks/neutron_plumgrid_context.py
View File

@ -101,12 +101,13 @@ class NeutronPGPluginContext(context.NeutronContext):
else:
pg_ctxt['nova_metadata_proxy_secret'] = 'plumgrid'
identity_context = _identity_context()
pg_ctxt['admin_user'] = identity_context['admin_user']
pg_ctxt['admin_password'] = identity_context['admin_password']
pg_ctxt['admin_tenant_name'] = identity_context['admin_tenant_name']
pg_ctxt['service_protocol'] = identity_context['service_protocol']
pg_ctxt['auth_port'] = identity_context['auth_port']
pg_ctxt['auth_host'] = identity_context['auth_host']
if relation_get("service_hostname"):
identity_context = _identity_context()
pg_ctxt['admin_user'] = identity_context['admin_user']
pg_ctxt['admin_password'] = identity_context['admin_password']
pg_ctxt['admin_tenant_name'] = identity_context['admin_tenant_name']
pg_ctxt['service_protocol'] = identity_context['service_protocol']
pg_ctxt['auth_port'] = identity_context['auth_port']
pg_ctxt['auth_host'] = identity_context['auth_host']
return pg_ctxt

7
hooks/neutron_plumgrid_hooks.py
View File

@ -86,13 +86,6 @@ def neutron_plugin_joined():
@hooks.hook("identity-admin-relation-changed")
def identity_admin_changed():
if not relation_get("service_hostname"):
log("Relation not ready")
return
identity_admin_relation()
@hooks.hook("identity-admin-relation-departed")
@hooks.hook("identity-admin-relation-broken")
@restart_on_change(restart_map())