diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-01-27 10:03:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-01-27 10:03:34 +0000 |
commit | c0328095f17796fb1b87a1da355f40dda10c06fe (patch) | |
tree | a1348a7f1141be9c9d96d8eecdc574c06c829c50 /overcloud-without-mergepy.yaml | |
parent | 6629b49665ac31f71002ee603c959617e514d522 (diff) | |
parent | 4f4d8e3d161162483b9ef702a33a895c854599ac (diff) |
Merge "Add parameter to manage usage of Neutron l3_ha option"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 9ff0dc1d..79d5d9fa 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -139,6 +139,10 @@ parameters: default: 'True' description: Allow automatic l3-agent failover type: string + NeutronL3HA: + default: 'False' + description: Whether to enable l3-agent HA + type: string NovaPassword: default: unset description: The password for the nova service account, used by nova-api. @@ -517,6 +521,7 @@ resources: NeutronAgentMode: {get_param: NeutronAgentMode} NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover} + NeutronL3HA: {get_param: NeutronL3HA} NeutronNetworkType: {get_param: NeutronNetworkType} NeutronTunnelTypes: {get_param: NeutronTunnelTypes} NovaPassword: {get_param: NovaPassword} @@ -577,6 +582,7 @@ resources: NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice} NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover} + NeutronL3HA: {get_param: NeutronL3HA} NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} NovaComputeDriver: {get_param: NovaComputeDriver} NovaComputeExtraConfig: {get_param: NovaComputeExtraConfig} |