openstack/charm-nova-compute
Code Issues Proposed changes

allow net_dev_mtu local override

Browse Source
This commit is contained in:
Edward Hope-Morley 2015-02-10 14:38:40 +00:00
parent 226125407c
commit e70a8735e3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/nova_compute_utils.py
View File

@ -182,6 +182,8 @@ def resource_map():
# depending on the plugin used. # depending on the plugin used.
# NOTE(james-page): only required for ovs plugin right now # NOTE(james-page): only required for ovs plugin right now
if net_manager in ['neutron', 'quantum']: if net_manager in ['neutron', 'quantum']:
# This stanza supports the legacy case of ovs supported within
# compute charm code (now moved to neutron-openvswitch subordinate)
if not relation_ids('neutron-plugin') and plugin == 'ovs': if not relation_ids('neutron-plugin') and plugin == 'ovs':
if net_manager == 'quantum': if net_manager == 'quantum':
nm_rsc = QUANTUM_RESOURCES nm_rsc = QUANTUM_RESOURCES