Don't write {neutron,quantum} files if standalone neutron-api is present
This commit is contained in:
parent
0b55e92ead
commit
40b345658d
@ -124,10 +124,11 @@ def amqp_changed():
|
||||
log('amqp relation incomplete. Peer not ready?')
|
||||
return
|
||||
CONFIGS.write(NOVA_CONF)
|
||||
if network_manager() == 'quantum':
|
||||
CONFIGS.write(QUANTUM_CONF)
|
||||
if network_manager() == 'neutron':
|
||||
CONFIGS.write(NEUTRON_CONF)
|
||||
if not is_relation_made('neutron-api'):
|
||||
if network_manager() == 'quantum':
|
||||
CONFIGS.write(QUANTUM_CONF)
|
||||
if network_manager() == 'neutron':
|
||||
CONFIGS.write(NEUTRON_CONF)
|
||||
|
||||
|
||||
@hooks.hook('shared-db-relation-joined')
|
||||
@ -239,12 +240,13 @@ def identity_changed():
|
||||
return
|
||||
CONFIGS.write('/etc/nova/api-paste.ini')
|
||||
CONFIGS.write(NOVA_CONF)
|
||||
if network_manager() == 'quantum':
|
||||
CONFIGS.write(QUANTUM_API_PASTE)
|
||||
CONFIGS.write(QUANTUM_CONF)
|
||||
save_novarc()
|
||||
if network_manager() == 'neutron':
|
||||
CONFIGS.write(NEUTRON_CONF)
|
||||
if not is_relation_made('neutron-api'):
|
||||
if network_manager() == 'quantum':
|
||||
CONFIGS.write(QUANTUM_API_PASTE)
|
||||
CONFIGS.write(QUANTUM_CONF)
|
||||
save_novarc()
|
||||
if network_manager() == 'neutron':
|
||||
CONFIGS.write(NEUTRON_CONF)
|
||||
[compute_joined(rid) for rid in relation_ids('cloud-compute')]
|
||||
[quantum_joined(rid) for rid in relation_ids('quantum-network-service')]
|
||||
[nova_vmware_relation_joined(rid) for rid in relation_ids('nova-vmware')]
|
||||
|
@ -194,10 +194,8 @@ def resource_map():
|
||||
resource_map.pop(APACHE_24_CONF)
|
||||
|
||||
if is_relation_made('neutron-api'):
|
||||
resource_map.pop(QUANTUM_CONF)
|
||||
resource_map.pop(QUANTUM_DEFAULT)
|
||||
resource_map.pop(NEUTRON_CONF)
|
||||
resource_map.pop(NEUTRON_DEFAULT)
|
||||
[resource_map.pop(k) for k in list(resource_map.iterkeys())
|
||||
if 'quantum' in k or 'neutron' in k]
|
||||
resource_map[NOVA_CONF]['contexts'].append(
|
||||
nova_cc_context.NeutronAPIContext())
|
||||
else:
|
||||
|
Loading…
x
Reference in New Issue
Block a user