summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-18 11:24:45 +0000
committerGerrit Code Review <review@openstack.org>2015-11-18 11:24:45 +0000
commitf6ff1a819190877093a90fb97ef7c9c8f6ce5164 (patch)
treeb6d1c628bf88322f6f4fc2cd46cdf57ca40936da
parent37f712d07fec7341c0ca42cb175d370a20736a9f (diff)
parent987174c7b4514d08a61505997ddb1a6ccbda77de (diff)
Merge "Implement Neutron enable_isolated_metadata parameters"
-rw-r--r--os-apply-config/controller.yaml6
-rw-r--r--overcloud-without-mergepy.yaml5
-rw-r--r--puppet/controller.yaml6
3 files changed, 17 insertions, 0 deletions
diff --git a/os-apply-config/controller.yaml b/os-apply-config/controller.yaml
index bf32f250..aed2367c 100644
--- a/os-apply-config/controller.yaml
+++ b/os-apply-config/controller.yaml
@@ -355,6 +355,10 @@ parameters:
type: number
default: 3
description: The number of neutron dhcp agents to schedule per network
+ NeutronEnableIsolatedMetadata:
+ default: 'False'
+ description: If True, DHCP provide metadata route to VM.
+ type: string
NeutronEnableTunnelling:
type: string
default: "True"
@@ -728,6 +732,7 @@ resources:
allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
l3_ha: {get_input: neutron_l3_ha}
dhcp_agents_per_network: {get_input: neutron_dhcp_agents_per_network}
+ enable_isolated_metadata: {get_input: neutron_enable_isolated_metadata}
ovs:
enable_tunneling: {get_input: neutron_enable_tunneling}
l2_population: {get_input: neutron_enable_l2pop}
@@ -891,6 +896,7 @@ resources:
controller_virtual_ip: {get_param: VirtualIP}
neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
neutron_enable_l2pop: {get_param: NeutronEnableL2Pop}
+ neutron_enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata}
heat.watch_server_url:
list_join:
- ''
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 9320ca24..f679c6bb 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -115,6 +115,10 @@ parameters:
default: 'ctlplane'
type: string
description: Neutron ID or name for ctlplane network.
+ NeutronEnableIsolatedMetadata:
+ default: 'False'
+ description: If True, DHCP provide metadata route to VM.
+ type: string
NeutronEnableTunnelling:
type: string
default: "True"
@@ -841,6 +845,7 @@ resources:
NeutronFlatNetworks: {get_param: NeutronFlatNetworks}
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
NeutronExternalNetworkBridge: {get_param: NeutronExternalNetworkBridge}
+ NeutronEnableIsolatedMetadata: {get_param: NeutronEnableIsolatedMetadata}
NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling}
NeutronEnableL2Pop: {get_param: NeutronEnableL2Pop}
NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges}
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 920bd885..2e8c3126 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:
@@ -1172,6 +1177,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}