flatten the neutron-plugin-mlnx-sdn service

This change combines the previous puppet and docker files into a single
file that performs the docker service installation and configuration
for the neutron-plugin-ml2-mlnx-sdn-assist service.

Related-Blueprint: services-yaml-flattening

Change-Id: I0b1e0b52f26a57847263f311ea0c018bc15df46f

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

@@ -4,20 +4,6 @@ description: >
   MLNX SDN configuration assist for Neutron ML2 Plugin.
 
 parameters:
-  MlnxSDNUsername:
-    description: The username for the SDN server.
-    type: string
-  MlnxSDNPassword:
-    type: string
-    description: The password for the SDN server.
-    hidden: true
-  MlnxSDNUrl:
-    description: SDN server URL
-    type: string
-  MlnxSDNDomain:
-    description: SDN server domain
-    type: string
-    default: 'cloudx'
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -45,11 +31,28 @@ parameters:
       Mapping of service endpoint -> protocol. Typically set
       via parameter_defaults in the resource registry.
     type: json
+  DockerNeutronConfigImage:
+    description: The container image to use for the neutron config_volume
+    type: string
+  MlnxSDNUsername:
+    description: The username for the SDN server.
+    type: string
+  MlnxSDNPassword:
+    type: string
+    description: The password for the SDN server.
+    hidden: true
+  MlnxSDNUrl:
+    description: SDN server URL
+    type: string
+  MlnxSDNDomain:
+    description: SDN server domain
+    type: string
+    default: 'cloudx'
 
 resources:
 
   NeutronMl2Base:
-    type: ./neutron-plugin-ml2.yaml
+    type: ../../puppet/services/neutron-plugin-ml2.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
@@ -70,5 +73,13 @@ outputs:
             neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_password: {get_param: MlnxSDNPassword}
             neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_url: {get_param: MlnxSDNUrl}
             neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_domain: {get_param: MlnxSDNDomain}
-      step_config: |
-        include ::tripleo::profile::base::neutron::plugins::ml2
+      service_config_settings: {}
+      # BEGIN DOCKER SETTINGS
+      puppet_config:
+        config_volume: 'neutron'
+        puppet_tags: neutron_plugin_ml2
+        step_config: |
+          include ::tripleo::profile::base::neutron::plugins::ml2
+        config_image: {get_param: DockerNeutronConfigImage}
+      kolla_config: {}
+      docker_config: {}

docker/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml

@@ -1,65 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  MLNX SDN configuration assist for Neutron ML2 Plugin.
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: >
-      Mapping of service endpoint -> protocol. Typically set
-      via parameter_defaults in the resource registry.
-    type: json
-  DockerNeutronConfigImage:
-    description: The container image to use for the neutron config_volume
-    type: string
-
-resources:
-
-  NeutronMl2MLNXBase:
-    type: ../../puppet/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
-outputs:
-  role_data:
-    description: Role data for the MLNX SDN ML2 Plugin.
-    value:
-      service_name: {get_attr: [NeutronMl2MLNXBase, role_data, service_name]}
-      config_settings: {get_attr: [NeutronMl2MLNXBase, role_data, config_settings]}
-      service_config_settings: {get_attr: [NeutronMl2MLNXBase, role_data, service_config_settings]}
-      # BEGIN DOCKER SETTINGS
-      puppet_config:
-        config_volume: 'neutron'
-        puppet_tags: neutron_plugin_ml2
-        step_config:
-          get_attr: [NeutronMl2MLNXBase, role_data, step_config]
-        config_image: {get_param: DockerNeutronConfigImage}
-      kolla_config: {}
-      docker_config: {}

overcloud-resource-registry-puppet.j2.yaml

@@ -157,7 +157,7 @@ resource_registry:
   OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-container-puppet.yaml
   OS::TripleO::Services::OVNController: deployment/ovn/ovn-controller-container-puppet.yaml
 
-  OS::TripleO::Services::NeutronCorePluginMLNXSDN: docker/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml
+  OS::TripleO::Services::NeutronCorePluginMLNXSDN: deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml
   OS::TripleO::Services::NeutronCorePluginVTS: deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePluginML2Ansible: deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml