Merge "Add parameter to manage usage of Neutron l3_ha option"

9 files changed, 31 insertions, 1 deletions

diff --git a/compute-config-puppet.yaml b/compute-config-puppet.yaml
index 8414579c..5ad94f98 100644
--- a/compute-config-puppet.yaml
+++ b/compute-config-puppet.yaml
@@ -91,7 +91,7 @@ resources:
                 neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                 neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
                 neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
-                neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+                neutron_l3_ha: {get_input: neutron_l3_ha}
                 neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
                 admin_password: {get_input: admin_password}
                 nova::rabbit_host: {get_input: rabbit_host}
diff --git a/compute-config.yaml b/compute-config.yaml
index 5477e8c9..0a863aa9 100644
--- a/compute-config.yaml
+++ b/compute-config.yaml
@@ -50,6 +50,7 @@ resources:
           metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
           mechanism_drivers: {get_input: neutron_mechanism_drivers}
           allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+          l3_ha: {get_input: neutron_l3_ha}
           ovs:
             local_ip: {get_input: neutron_local_ip}
             tenant_network_type: {get_input: neutron_tenant_network_type}
diff --git a/compute.yaml b/compute.yaml
index 66d4bef0..dbeeeb0c 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -172,6 +172,10 @@ parameters:
     default: 'True'
     description: Allow automatic l3-agent failover
     type: string
+  NeutronL3HA:
+    default: 'False'
+    description: Whether to enable l3-agent HA
+    type: string
   NeutronAgentMode:
     default: 'dvr_snat'
     description: Agent mode for the neutron-l3-agent on the controller hosts
@@ -297,6 +301,7 @@ resources:
         neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
         neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
         neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
+        neutron_l3_ha: {get_param: NeutronL3HA}
         neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
         admin_password: {get_param: AdminPassword}
         rabbit_host: {get_param: RabbitHost}
diff --git a/controller-config.yaml b/controller-config.yaml
index fa9db05a..30cc5c6c 100644
--- a/controller-config.yaml
+++ b/controller-config.yaml
@@ -87,6 +87,7 @@ resources:
           router_distributed: {get_input: neutron_router_distributed}
           mechanism_drivers: {get_input: neutron_mechanism_drivers}
           allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+          l3_ha: {get_input: neutron_l3_ha}
           ovs:
             enable_tunneling: {get_input: neutron_enable_tunneling}
             local_ip: {get_input: controller_host}
diff --git a/controller.yaml b/controller.yaml
index 3d767c50..9b7e3e0c 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -220,6 +220,10 @@ parameters:
     default: 'True'
     description: Allow automatic l3-agent failover
     type: string
+  NeutronL3HA:
+    default: 'False'
+    description: Whether to enable l3-agent HA
+    type: string
   NeutronEnableTunnelling:
     type: string
     default: "True"
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 07aacd5f..1fe787e3 100644
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -37,6 +37,7 @@ resources:
           metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
           mechanism_drivers: {get_input: neutron_mechanism_drivers}
           allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+          l3_ha: {get_input: neutron_l3_ha}
           ovs:
             local_ip: {get_input: neutron_local_ip}
             tenant_network_type: {get_input: neutron_tenant_network_type}
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 70172cb2..e68c61f9 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -135,6 +135,10 @@ parameters:
     default: 'True'
     description: Allow automatic l3-agent failover
     type: string
+  NeutronL3HA:
+    default: 'False'
+    description: Whether to enable l3-agent HA
+    type: string
   NovaApiHost:
     type: string
   NovaComputeDriver:
@@ -234,6 +238,7 @@ resources:
         neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
         neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
         neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
+        neutron_l3_ha: {get_param: NeutronL3HA}
         admin_password: {get_param: AdminPassword}
         rabbit_host: {get_param: RabbitHost}
         rabbit_username: {get_param: RabbitUserName}
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:
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}