1 From ca931831dbfe876095357acbf39dca17c3d3df71 Mon Sep 17 00:00:00 2001
2 From: root <root@overcloud-controller-0.localdomain>
3 Date: Sun, 17 Jan 2016 03:07:49 +0000
4 Subject: [PATCH] Adds force metadata option
7 manifests/agents/dhcp.pp | 10 ++++++++--
8 1 file changed, 8 insertions(+), 2 deletions(-)
10 diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp
11 index 0c10492..cf772b5 100644
12 --- a/manifests/agents/dhcp.pp
13 +++ b/manifests/agents/dhcp.pp
15 # (optional) enable metadata support on isolated networks.
18 +# [*enable_force_metadata*]
19 +# (optional) enable metadata support on all networks.
22 # [*enable_metadata_network*]
23 # (optional) Allows for serving metadata requests coming from a dedicated metadata
24 # access network whose cidr is 169.254.169.254/16 (or larger prefix), and is
25 @@ -86,6 +90,7 @@ class neutron::agents::dhcp (
26 $dnsmasq_config_file = undef,
27 $dhcp_delete_namespaces = true,
28 $enable_isolated_metadata = false,
29 + $enable_force_metadata = false,
30 $enable_metadata_network = false,
31 $dhcp_broadcast_reply = false,
32 # DEPRECATED PARAMETERS
33 @@ -110,11 +115,12 @@ class neutron::agents::dhcp (
37 - if (! $enable_isolated_metadata) and $enable_metadata_network {
38 - fail('enable_metadata_network to true requires enable_isolated_metadata also enabled.')
39 + if (! ($enable_isolated_metadata or $enable_force_metadata)) and $enable_metadata_network {
40 + fail('enable_metadata_network to true requires enable_isolated_metadata or enable_force_metadata also enabled.')
42 neutron_dhcp_agent_config {
43 'DEFAULT/enable_isolated_metadata': value => $enable_isolated_metadata;
44 + 'DEFAULT/force_metadata': value => $enable_force_metadata;
45 'DEFAULT/enable_metadata_network': value => $enable_metadata_network;