From: Lokesh Jain <lokesh.jain@gmail.com>
Date: Wed, 23 Aug 2017 22:12:37 +0000 (-0400)
Subject: Make nova patching parameters configurable in Nuage
X-Git-Tag: opnfv-6.0.0~104^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=32f2aa75a54c6f4693e264f8446bd616a1c6bf17;p=apex-tripleo-heat-templates.git

Make nova patching parameters configurable in Nuage

Nova patching parameters are available in nova.conf but are not
configurable from tripleo-heat-templates. Exposing these parameters
from Nuage composable services to make them configurable. It enables
setting the patching parameters in environment files. This change
depends on the addition of nova patching configuration parameters.

Change-Id: Iacad25da044f2bac83ee5f577ddcd70650eb61e5
Depends-On: I51ef3e19daff1d98cfe5c2c16475c16e6a3e3e0f
(cherry picked from commit f0041153eca8d82bb7f72dc68676cab8448ef037)
---

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index ce64311b..fb47770f 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -28,6 +28,8 @@ parameter_defaults:
   NeutronTunnelIdRanges: ''
   NeutronNetworkVLANRanges: ''
   NeutronVniRanges: ''
+  NovaPatchConfigMonkeyPatch: false
+  NovaPatchConfigMonkeyPatchModules: ''
   NovaOVSBridge: 'default_bridge'
   NeutronMetadataProxySharedSecret: 'default'
   InstanceNameTemplate: 'inst-%08x'
diff --git a/puppet/services/neutron-plugin-ml2-nuage.yaml b/puppet/services/neutron-plugin-ml2-nuage.yaml
index a7dc2e8b..4cd541cc 100644
--- a/puppet/services/neutron-plugin-ml2-nuage.yaml
+++ b/puppet/services/neutron-plugin-ml2-nuage.yaml
@@ -67,6 +67,16 @@ parameters:
     type: boolean
     default: false
 
+  NovaPatchConfigMonkeyPatch:
+    description: Apply monkey patching or not
+    type: boolean
+    default: false
+
+  NovaPatchConfigMonkeyPatchModules:
+    description: List of modules/decorators to monkey patch
+    type: comma_delimited_list
+    default: ''
+
 resources:
 
   NeutronML2Base:
@@ -95,5 +105,7 @@ outputs:
             neutron::plugins::ml2::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion}
             neutron::plugins::ml2::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId}
             nova::api::use_forwarded_for: {get_param: UseForwardedFor}
+            nova::patch::config::monkey_patch: {get_param: NovaPatchConfigMonkeyPatch}
+            nova::patch::config::monkey_patch_modules: {get_param: NovaPatchConfigMonkeyPatchModules}
       step_config: |
         include tripleo::profile::base::neutron::plugins::ml2