unset keystone quantum enpoints when the standalone charm takes over
This commit is contained in:
parent
40b345658d
commit
ce1fe0d102
@ -512,6 +512,8 @@ def neutron_api_relation_joined():
|
||||
out.write('manual\n')
|
||||
if service_running('neutron-server'):
|
||||
service_stop('neutron-server')
|
||||
for rid in relation_ids('identity-service'):
|
||||
identity_joined(rid=rid)
|
||||
|
||||
@hooks.hook('neutron-api-relation-changed')
|
||||
def neutron_api_relation_changed():
|
||||
|
@ -691,7 +691,15 @@ def determine_endpoints(url):
|
||||
})
|
||||
|
||||
# XXX: Keep these relations named quantum_*??
|
||||
if network_manager() in ['quantum', 'neutron']:
|
||||
if is_relation_made('neutron-api'):
|
||||
endpoints.update({
|
||||
'quantum_service': '',
|
||||
'quantum_region': '',
|
||||
'quantum_public_url': '',
|
||||
'quantum_admin_url': '',
|
||||
'quantum_internal_url': '',
|
||||
})
|
||||
elif network_manager() in ['quantum', 'neutron']:
|
||||
endpoints.update({
|
||||
'quantum_service': 'quantum',
|
||||
'quantum_region': region,
|
||||
|
Loading…
Reference in New Issue
Block a user