openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Implement Neutron enable_isolated_metadata parameters"

Browse Source
This commit is contained in:
Jenkins 2015-11-18 11:24:45 +00:00 committed by Gerrit Code Review
commit f6ff1a8191
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os-apply-config/controller.yaml
View File

@ -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:
- ''

5
overcloud-without-mergepy.yaml
View File

@ -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}

6
puppet/controller.yaml
View File

@ -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}