From 1ae411e9d21cb8aa38dd161224b7d638a3fe597e Mon Sep 17 00:00:00 2001
From: Janki Chhatbar <jchhatba@redhat.com>
Date: Mon, 18 Jun 2018 22:31:25 +0530
Subject: [PATCH] Delete deprecated parameters

OpenDaylightPort and OpenDaylightConnectionProtocol
were deprecated and are being removed in this patch.

Change-Id: Iac57b2c12735d972c8165bfe7374381a3ffd51e2
---
 puppet/services/opendaylight-api.yaml | 35 ++-------------------------
 puppet/services/opendaylight-ovs.yaml | 30 +----------------------
 2 files changed, 3 insertions(+), 62 deletions(-)

diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index 8997acfca0..2d943f6496 100644
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -4,10 +4,6 @@ description: >
   OpenDaylight SDN Controller.
 
 parameters:
-  OpenDaylightPort:
-    default: 0
-    description: Set opendaylight service port
-    type: number
   OpenDaylightUsername:
     default: 'admin'
     description: The username for the opendaylight server.
@@ -17,10 +13,6 @@ parameters:
     type: string
     description: The password for the opendaylight server.
     hidden: true
-  OpenDaylightConnectionProtocol:
-    description: L7 protocol used for REST access
-    type: string
-    default: 'http'
   OpenDaylightFeatures:
     description: List of features to install with ODL
     type: comma_delimited_list
@@ -93,25 +85,9 @@ parameters:
     type: boolean
     default: false
 
-parameter_groups:
-- label: deprecated
-  description: |
-   The following parameters are deprecated and will be removed. They should not
-   be relied on for new deployments. If you have concerns regarding deprecated
-   parameters, please contact the TripleO development team on IRC or the
-   OpenStack mailing list.
-  parameters:
-    - OpenDaylightConnectionProtocol
-    - OpenDaylightPort
-
 conditions:
 
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
-  odl_deprecated_port_set:
-    not:
-      equals:
-        - {get_param: OpenDaylightPort}
-        - 0
 
 outputs:
   role_data:
@@ -121,11 +97,7 @@ outputs:
       config_settings:
         map_merge:
           -
-            opendaylight::odl_rest_port:
-              if:
-                - odl_deprecated_port_set
-                - {get_param: OpenDaylightPort}
-                - {get_param: [EndpointMap, OpenDaylightInternal, port]}
+            opendaylight::odl_rest_port: {get_param: [EndpointMap, OpenDaylightInternal, port]}
             opendaylight::username: {get_param: OpenDaylightUsername}
             opendaylight::password: {get_param: OpenDaylightPassword}
             opendaylight::extra_features: {get_param: OpenDaylightFeatures}
@@ -139,10 +111,7 @@ outputs:
             tripleo.opendaylight_api.firewall_rules:
               '137 opendaylight api':
                 dport:
-                  - if:
-                      - odl_deprecated_port_set
-                      - {get_param: OpenDaylightPort}
-                      - {get_param: [EndpointMap, OpenDaylightInternal, port]}
+                  - {get_param: [EndpointMap, OpenDaylightInternal, port]}
                   - 6640
                   - 6653
                   - 2550
diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
index 8f9102f9d2..25d2694d5e 100644
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -4,10 +4,6 @@ description: >
   OpenDaylight OVS Configuration.
 
 parameters:
-  OpenDaylightPort:
-    default: 0
-    description: Set opendaylight service port
-    type: number
   OpenDaylightUsername:
     default: 'admin'
     description: The username for the opendaylight server.
@@ -17,10 +13,6 @@ parameters:
     type: string
     description: The password for the opendaylight server.
     hidden: true
-  OpenDaylightConnectionProtocol:
-    description: L7 protocol used for REST access
-    type: string
-    default: 'http'
   OpenDaylightCheckURL:
     description: URL postfix to verify ODL has finished starting up
     type: string
@@ -134,25 +126,9 @@ parameters:
     tags:
       - role_specific
 
-parameter_groups:
-- label: deprecated
-  description: |
-   The following parameters are deprecated and will be removed. They should not
-   be relied on for new deployments. If you have concerns regarding deprecated
-   parameters, please contact the TripleO development team on IRC or the
-   OpenStack mailing list.
-  parameters:
-    - OpenDaylightConnectionProtocol
-    - OpenDaylightPort
-
 conditions:
 
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
-  odl_deprecated_port_set:
-    not:
-      equals:
-        - {get_param: OpenDaylightPort}
-        - 0
 
 resources:
   Ovs:
@@ -201,11 +177,7 @@ outputs:
       service_name: opendaylight_ovs
       config_settings:
         map_merge:
-          - opendaylight::odl_rest_port:
-              if:
-                - odl_deprecated_port_set
-                - {get_param: OpenDaylightPort}
-                - {get_param: [EndpointMap, OpenDaylightInternal, port]}
+          - opendaylight::odl_rest_port: {get_param: [EndpointMap, OpenDaylightInternal, port]}
             opendaylight::username: {get_param: OpenDaylightUsername}
             opendaylight::password: {get_param: OpenDaylightPassword}
             neutron::plugins::ovs::opendaylight::odl_username: {get_param: OpenDaylightUsername}