summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorCyril Lopez <cylopez@redhat.com>2015-10-20 09:48:49 +0200
committerCyril Lopez <cylopez@redhat.com>2015-11-17 17:30:16 +0100
commit987174c7b4514d08a61505997ddb1a6ccbda77de (patch)
tree97bc44342d08ec17082c12d384550356ac1fae83 /puppet
parent2f2271a6a32d1b5b8f0008901b5163d65b0dc428 (diff)
Implement Neutron enable_isolated_metadata parameters
* Use the parameter in Puppet configuration (Hiera) to configure neutron BZ-1273303 Change-Id: Ic5a7a1f13fd2bc800cadc3a78b1daadbc0394787 Signed-off-by: Cyril Lopez <cylopez@redhat.com>
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 6aabe572..e07ac8e5 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -366,6 +366,10 @@ parameters:
default: 'True'
description: Allow automatic l3-agent failover
type: string
+ NeutronEnableIsolatedMetadata:
+ default: 'False'
+ description: If True, DHCP provide metadata route to VM.
+ type: string
NeutronEnableTunnelling:
type: string
default: "True"
@@ -712,6 +716,7 @@ resources:
bootstack_nodeid: {get_attr: [Controller, name]}
neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
neutron_enable_l2pop: {get_param: NeutronEnableL2Pop}
+ neutron_enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata}
haproxy_log_address: {get_param: HAProxySyslogAddress}
heat.watch_server_url:
list_join:
@@ -1171,6 +1176,7 @@ resources:
neutron::agents::l3::external_network_bridge: {get_input: neutron_external_network_bridge}
neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling}
neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop}
+ neutron::agents::dhcp::enable_isolated_metadata: {get_input: neutron_enable_isolated_metadata}
neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
neutron_flat_networks: {get_input: neutron_flat_networks}
neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret}