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-source.yaml | |
parent | 6629b49665ac31f71002ee603c959617e514d522 (diff) | |
parent | 4f4d8e3d161162483b9ef702a33a895c854599ac (diff) |
Merge "Add parameter to manage usage of Neutron l3_ha option"
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r-- | overcloud-source.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index f24a92bf..f73206d7 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -295,6 +295,10 @@ parameters: default: 'True' description: Allow automatic l3-agent failover type: string + NeutronL3HA: + default: 'False' + description: Whether to enable l3-agent HA + type: string NovaComputeDriver: default: libvirt.LibvirtDriver type: string @@ -448,6 +452,8 @@ resources: get_param: NeutronMechanismDrivers NeutronAllowL3AgentFailover: get_param: NeutronAllowL3AgentFailover + NeutronL3HA: + get_param: NeutronL3HA NovaCompute0AllNodesDeployment: type: FileInclude Path: nova-compute-instance.yaml @@ -614,6 +620,7 @@ resources: router_distributed: {get_param: NeutronDVR} mechanism_drivers: {get_param: NeutronMechanismDrivers} allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} + l3_ha: {get_param: NeutronL3HA} ovs: enable_tunneling: 'True' local_ip: |