openstack
/
charm-neutron-openvswitch
Code Issues Proposed changes

Metadata tidy

This commit is contained in:
Liam Young 2015-09-08 13:23:26 +01:00
parent 9595e7516c
commit 806049e08f
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -98,6 +98,6 @@ options:
traffic to the external public network. Valid values are either MAC
addresses (in which case only MAC addresses for interfaces without an IP
address already assigned will be used), or interfaces (eth0)
enable-metadata:
enable-local-dhcp-and-metadata:
type: boolean
default: false

5
hooks/neutron_ovs_hooks.py
View File

@ -94,9 +94,8 @@ def neutron_plugin_api_changed():
@hooks.hook('neutron-plugin-relation-joined')
def neutron_plugin_joined(relation_id=None):
print "Enable metadata: {}".format(enable_metadata())
if config('enable-metadata'):
apt_install('neutron-metadata-agent', fatal=True)
apt_install('neutron-dhcp-agent', fatal=True)
if config('enable-local-dhcp-and-metadata'):
apt_install(['neutron-metadata-agent', 'neutron-dhcp-agent'] fatal=True)
secret = get_shared_secret() if enable_metadata() else None
rel_data = {
'metadata-shared-secret': secret,

2
hooks/neutron_ovs_utils.py
View File

@ -231,7 +231,7 @@ def use_dvr():
def enable_metadata():
return use_dvr() or config('enable-metadata')
return use_dvr() or config('enable-local-dhcp-and-metadata')
def git_install(projects_yaml):