summaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.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 /nova-compute-instance.yaml
parent897c8b8aa9295b0214f35bd08ac42416078904f5 (diff)
parent23d85de69b7921e76dce7ce8080eefaf06b094ff (diff)
Merge "Enable Neutron DVR support in TripleO installation"
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml22
1 files changed, 22 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index ab958b77..180657a6 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -144,6 +144,22 @@ parameters:
The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan'
type: string
+ NeutronPublicInterfaceRawDevice:
+ default: ''
+ type: string
+ NeutronDVR:
+ default: 'False'
+ 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
NovaApiHost:
type: string
NovaComputeDriver:
@@ -240,7 +256,13 @@ resources:
neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
neutron_physical_bridge: {get_param: NeutronPhysicalBridge}
neutron_public_interface: {get_param: NeutronPublicInterface}
+ neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
neutron_password: {get_param: NeutronPassword}
+ neutron_agent_mode: {get_param: NeutronComputeAgentMode}
+ neutron_router_distributed: {get_param: NeutronDVR}
+ neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
+ neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
+ neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
admin_password: {get_param: AdminPassword}
rabbit_host: {get_param: RabbitHost}
rabbit_username: {get_param: RabbitUserName}