openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Don't write {neutron,quantum} files if standalone neutron-api is present

Browse Source
This commit is contained in:
Liam Young 2014-05-15 08:26:56 +00:00
parent 0b55e92ead
commit 40b345658d
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hooks/nova_cc_hooks.py
View File

@ -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')]

6
hooks/nova_cc_utils.py
View File

@ -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: