Merge "Change authentication method for Mellanox sdn controller"

deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml

@@ -32,11 +32,15 @@ parameters:
     description: The container image to use for the neutron config_volume
     type: string
   MlnxSDNUsername:
-    description: The username for the SDN server.
+    description: DEPRECATED, The username for the SDN server.
     type: string
   MlnxSDNPassword:
     type: string
-    description: The password for the SDN server.
+    description: DEPRECATED, The password for the SDN server.
+    hidden: true
+  MlnxSDNToken:
+    description: The token for the SDN server.
+    type: string
     hidden: true
   MlnxSDNUrl:
     description: SDN server URL
@@ -55,6 +59,17 @@ parameters:
     type: string
     default: 'datacentre'
 
+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:
+  - MlnxSDNUsername
+  - MlnxSDNPassword
+
 resources:
   NeutronMl2Base:
     type: ./neutron-plugin-ml2.yaml
@@ -73,8 +88,7 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NeutronMl2Base, role_data, config_settings]
-          - neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_username: {get_param: MlnxSDNUsername}
-            neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_password: {get_param: MlnxSDNPassword}
+            neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_token: {get_param: MlnxSDNToken}
             neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_url: {get_param: MlnxSDNUrl}
             neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_domain: {get_param: MlnxSDNDomain}
             neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sync_enabled: {get_param: MlnxSDNSyncEnabled}

environments/neutron-ml2-mlnx-sdn.yaml

@@ -5,8 +5,7 @@ resource_registry:
 
 parameter_defaults:
 
-  MlnxSDNUsername: 'sdn_username'
-  #MlnxSDNPassword:
+  MlnxSDNToken: 'sdn_token'
   MlnxSDNUrl: 'sdn_url'
   MlnxSDNDomain: 'cloudx'
   MlnxSDNSyncEnabled: true

releasenotes/notes/add_token_auth-fb9f0dfe8e70a4c1.yaml

@@ -0,0 +1,10 @@
+---
+
+deprecations:
+  - |
+    The MlnxSDNUsername and MlnxSDNPassword have been deprecated
+    and have no effect
+other:
+  - |
+    A new param MlnxSDNToken has been added to authenticate sdn
+    controller