From 7450806b0c7d0bad20540442d69244eeafee6e3b Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 17 Nov 2016 11:10:56 +0000
Subject: [PATCH] Remove conditional for neutron l3_ha

This is handled in puppet-tripleo instead so we can remove the
hard-coded reference to ControllerCount and instead use the
hiera neutron_api_node_names to derive the number of neutron API
nodes regardless of roles.

Note that the NeutronL3HA parameter is maintained despite being
marked deprecated because we need to backport this bugfix so we
can't just remove it.  I'm not sure if we want to consider removing
the deprecation as leaving the override parameter in place seems
fairly low overhead.

Closes-Bug: #1629187
Change-Id: I7a77836dcaf809cc7959fca7691a4cd7d4af5d6a
Depends-On: I01c50973eec8138ec61304f2982d5026142f267c
(cherry picked from commit 4a35893ad938b0e22767ba5c7b646ca49ccbab04)
---
 puppet/services/neutron-api.yaml | 38 +++++++++-----------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index 408eb7958e..5fd9d7a27c 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -57,26 +57,20 @@ parameters:
     default:
       tag: openstack.neutron.api
       path: /var/log/neutron/server.log
-  ControllerCount:
-    description: |
-      Under normal conditions, this should not be overridden manually and is
-      set at deployment time. The default value is present to allow the
-      template to be used in environments that do not override it.
-    default: 1
-    type: number
 
   # DEPRECATED: the following options are deprecated and are currently maintained
   # for backwards compatibility. They will be removed in the Ocata cycle.
   NeutronL3HA:
-    default: false
+    default: ''
+    type: string
     description: |
-      Whether to enable HA for virtual routers. While the default value is
-      'false', L3 HA will be automatically enabled if the number of nodes
-      hosting controller configurations and DVR is disabled. This parameter is
-      being deprecated in Newton and is scheduled to be removed in Ocata.
-      Future releases will enable L3 HA by default if it is appropriate for the
-      deployment type. Alternate mechanisms will be available to override.
-    type: boolean
+      Whether to enable HA for virtual routers. When not set, L3 HA will be
+      automatically enabled if the number of nodes hosting controller
+      configurations and DVR is disabled. Valid values are 'true' or 'false'
+      This parameter is being deprecated in Newton and is scheduled to be
+      removed in Ocata.  Future releases will enable L3 HA by default if it is
+      appropriate for the deployment type. Alternate mechanisms will be
+      available to override.
 
 parameter_groups:
 - label: deprecated
@@ -97,18 +91,6 @@ resources:
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
-conditions:
-
-  auto_enable_l3_ha:
-    and:
-      - not:
-          equals:
-            - get_param: ControllerCount
-            - 1
-      - equals:
-        - get_param: NeutronEnableDVR
-        - false
-
 outputs:
   role_data:
     description: Role data for the Neutron Server agent service.
@@ -135,7 +117,6 @@ outputs:
             neutron::server::api_workers: {get_param: NeutronWorkers}
             neutron::server::rpc_workers: {get_param: NeutronWorkers}
             neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
-            neutron::server::l3_ha: {if: ["auto_enable_l3_ha", true, {get_param: NeutronL3HA}]}
             neutron::server::enable_proxy_headers_parsing: true
             neutron::keystone::authtoken::password: {get_param: NeutronPassword}
 
@@ -158,6 +139,7 @@ outputs:
             # internal_api_uri -> [IP]
             # internal_api_subnet - > IP/CIDR
             neutron::bind_host: {get_param: [ServiceNetMap, NeutronApiNetwork]}
+            tripleo::profile::base::neutron::server::l3_ha_override: {get_param: NeutronL3HA}
       step_config: |
         include tripleo::profile::base::neutron::server
       service_config_settings: