From fa3c8222f42728eb68647762e2735365ae39474b Mon Sep 17 00:00:00 2001
From: Sai Ram Peesapati <peesapatisairam@gmail.com>
Date: Thu, 29 Mar 2018 00:37:57 -0400
Subject: [PATCH] Parameterizing Puppet Tags

This commit will also provide third party vendors an option
to pass all the puppet tags that will configure the files needed
to enable their plugin.

Change-Id: I60feb19bf65aef82cfa56822e8ef79f13f70913d
---
 docker/services/neutron-plugin-ml2.yaml | 6 +++++-
 environments/neutron-nuage-config.yaml  | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index bf6f0b1de3..78b1e6ce56 100644
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@@ -36,6 +36,10 @@ parameters:
     type: boolean
     description: Flag to indicate undercloud upgrade process is being run.
     default: false
+  NeutronPluginMl2PuppetTags:
+    default: 'neutron_plugin_ml2'
+    description: Puppet resource tag names that are used to generate config files with puppet
+    type: string
 
 resources:
 
@@ -65,7 +69,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: 'neutron'
-        puppet_tags: neutron_plugin_ml2
+        puppet_tags: {get_param: NeutronPluginMl2PuppetTags}
         step_config:
           get_attr: [NeutronBase, role_data, step_config]
         config_image: {get_param: DockerNeutronConfigImage}
diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index fb47770fca..03a478110e 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -7,7 +7,7 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   # Override the NeutronCorePlugin to use Nuage
-  OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Nuage
+  OS::TripleO::Docker::NeutronMl2PluginBase: OS::TripleO::Services::NeutronCorePluginML2Nuage
 
 parameter_defaults:
   NeutronNuageNetPartitionName: 'default_name'
@@ -18,6 +18,7 @@ parameter_defaults:
   NeutronNuageBaseURIVersion: 'default_uri_version'
   NeutronNuageCMSId: ''
   UseForwardedFor: true
+  NeutronPluginMl2PuppetTags: 'neutron_plugin_ml2,neutron_plugin_nuage'
   NeutronServicePlugins: ''
   NeutronDBSyncExtraParams: '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini'
   NeutronTypeDrivers: ''