Metadata tidy
This commit is contained in:
parent
9595e7516c
commit
806049e08f
|
@ -98,6 +98,6 @@ options:
|
||||||
traffic to the external public network. Valid values are either MAC
|
traffic to the external public network. Valid values are either MAC
|
||||||
addresses (in which case only MAC addresses for interfaces without an IP
|
addresses (in which case only MAC addresses for interfaces without an IP
|
||||||
address already assigned will be used), or interfaces (eth0)
|
address already assigned will be used), or interfaces (eth0)
|
||||||
enable-metadata:
|
enable-local-dhcp-and-metadata:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
|
|
@ -94,9 +94,8 @@ def neutron_plugin_api_changed():
|
||||||
@hooks.hook('neutron-plugin-relation-joined')
|
@hooks.hook('neutron-plugin-relation-joined')
|
||||||
def neutron_plugin_joined(relation_id=None):
|
def neutron_plugin_joined(relation_id=None):
|
||||||
print "Enable metadata: {}".format(enable_metadata())
|
print "Enable metadata: {}".format(enable_metadata())
|
||||||
if config('enable-metadata'):
|
if config('enable-local-dhcp-and-metadata'):
|
||||||
apt_install('neutron-metadata-agent', fatal=True)
|
apt_install(['neutron-metadata-agent', 'neutron-dhcp-agent'] fatal=True)
|
||||||
apt_install('neutron-dhcp-agent', fatal=True)
|
|
||||||
secret = get_shared_secret() if enable_metadata() else None
|
secret = get_shared_secret() if enable_metadata() else None
|
||||||
rel_data = {
|
rel_data = {
|
||||||
'metadata-shared-secret': secret,
|
'metadata-shared-secret': secret,
|
||||||
|
|
|
@ -231,7 +231,7 @@ def use_dvr():
|
||||||
|
|
||||||
|
|
||||||
def enable_metadata():
|
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):
|
def git_install(projects_yaml):
|
||||||
|
|
Loading…
Reference in New Issue