From 885f64daf86e6ff80340b05eec893cdf9ec98b4a Mon Sep 17 00:00:00 2001
From: Sai Ram Peesapati <peesapatisairam@gmail.com>
Date: Tue, 5 Jun 2018 21:01:20 -0400
Subject: [PATCH] Conditionally Enable Nuage VRS

Using this change, users can conditionally enable and
configure Nuage VRS on Overcloud nodes

In Pike, as neutron-server is still running as a service on
the hypervisor, this approach will configure VRS which is also
running on the hypervisor.

This review is meant for Pike and earlier releases only.

Change-Id: Ib563842f182383a9cec49ee57943039346098b53
Depends-On: I6a996a6b9e1b2d4c74e25e2582699eb9e023093a
Closes-Bug: 1776998
---
 environments/neutron-nuage-config.yaml        |  1 +
 puppet/services/neutron-plugin-ml2-nuage.yaml | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index fb47770fca..941e642adc 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -18,6 +18,7 @@ parameter_defaults:
   NeutronNuageBaseURIVersion: 'default_uri_version'
   NeutronNuageCMSId: ''
   UseForwardedFor: true
+  NuageControllerEnableVrs: false
   NeutronServicePlugins: ''
   NeutronDBSyncExtraParams: '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini'
   NeutronTypeDrivers: ''
diff --git a/puppet/services/neutron-plugin-ml2-nuage.yaml b/puppet/services/neutron-plugin-ml2-nuage.yaml
index 59aaf11cfa..b8d82fc623 100644
--- a/puppet/services/neutron-plugin-ml2-nuage.yaml
+++ b/puppet/services/neutron-plugin-ml2-nuage.yaml
@@ -82,6 +82,27 @@ parameters:
     type: boolean
     default: false
 
+  NuageControllerEnableVrs:
+    description: Enbale Nuage VRS on Controller or not
+    type: boolean
+    default: false
+
+  NuageActiveController:
+    description: IP address of the Active Virtualized Services Controller (VSC)
+    type: string
+
+  NuageStandbyController:
+    description: IP address of the Standby Virtualized Services Controller (VSC)
+    type: string
+
+  NuageBridgeMTU:
+    description: Support for non-default MTU configured on each Compute node
+    type: string
+    default: ''
+
+conditions:
+  enable_nuage_vrs: {equals : [{get_param: NuageControllerEnableVrs}, true]}
+
 resources:
 
   NeutronMl2Base:
@@ -113,5 +134,13 @@ outputs:
             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}
+          -
+            if:
+            - enable_nuage_vrs
+            - nuage::vrs::active_controller: {get_param: NuageActiveController}
+              nuage::vrs::standby_controller: {get_param: NuageStandbyController}
+              nuage::vrs::bridge_mtu: {get_param: NuageBridgeMTU}
+              tripleo::profile::base::neutron::plugins::ml2::nuage::enable_vrs: {get_param: NuageControllerEnableVrs}
+            - {}
       step_config: |
         include tripleo::profile::base::neutron::plugins::ml2