aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-11 15:25:11 +0000
committerGerrit Code Review <review@openstack.org>2014-11-11 15:25:11 +0000
commit9b2446c88d73494322987423d5ffa88a5b2a5413 (patch)
treedfc283a1496537963820481fd1b1f35d82d2b86b /overcloud-source.yaml
parent897c8b8aa9295b0214f35bd08ac42416078904f5 (diff)
parent23d85de69b7921e76dce7ce8080eefaf06b094ff (diff)
Merge "Enable Neutron DVR support in TripleO installation"
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml50
1 files changed, 49 insertions, 1 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 64deb95b..bc36e90b 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -280,12 +280,46 @@ parameters:
overcloud.yaml to include the deployment of VLAN ports to the control
plane.
type: string
+ NeutronPublicInterfaceRawDevice:
+ default: ''
+ description: If set, the public interface is a vlan with this device as the raw device.
+ type: string
+ NeutronComputeAgentMode:
+ default: 'dvr'
+ description: Agent mode for the neutron-l3-agent on the compute hosts
+ type: string
+ NeutronAgentMode:
+ default: 'dvr_snat'
+ description: Agent mode for the neutron-l3-agent on the controller hosts
+ type: string
+ NeutronDVR:
+ default: 'False'
+ description: Whether to configure Neutron Distributed Virtual Routers
+ type: string
+ NeutronMetadataProxySharedSecret:
+ default: 'unset'
+ description: Shared secret to prevent spoofing
+ type: string
+ NeutronNetworkType:
+ default: 'gre'
+ description: The tenant network type for Neutron, either gre or vxlan.
+ type: string
NeutronTunnelTypes:
default: 'gre'
description: |
The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan'
type: string
+ NeutronMechanismDrivers:
+ default: 'openvswitch'
+ description: |
+ The mechanism drivers for the Neutron tenant network. To specify multiple
+ values, use a comma separated string, like so: 'openvswitch,l2_population'
+ type: string
+ NeutronAllowL3AgentFailover:
+ default: 'True'
+ description: Allow automatic l3-agent failover
+ type: string
NovaComputeDriver:
default: libvirt.LibvirtDriver
type: string
@@ -449,6 +483,16 @@ resources:
get_param: HypervisorNeutronPublicInterface
NeutronBridgeMappings:
get_param: NeutronBridgeMappings
+ NeutronDVR:
+ get_param: NeutronDVR
+ NeutronAgentMode:
+ get_param: NeutronComputeAgentMode
+ NeutronPublicInterfaceRawDevice:
+ get_param: NeutronPublicInterfaceRawDevice
+ NeutronMechanismDrivers:
+ get_param: NeutronMechanismDrivers
+ NeutronAllowL3AgentFailover:
+ get_param: NeutronAllowL3AgentFailover
NovaCompute0AllNodesDeployment:
type: FileInclude
Path: nova-compute-instance.yaml
@@ -609,7 +653,11 @@ resources:
debug: {get_param: Debug}
flat-networks: {get_param: NeutronFlatNetworks}
host: {get_input: controller_virtual_ip}
- metadata_proxy_shared_secret: unset
+ metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
+ agent_mode: {get_param: NeutronAgentMode}
+ router_distributed: {get_param: NeutronDVR}
+ mechanism_drivers: {get_param: NeutronMechanismDrivers}
+ allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
ovs:
enable_tunneling: 'True'
local_ip: