Merge "Conditionally Enable Nuage VRS" into stable/pike

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: ''

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