Merge "Composable roles within services - Redis"

[apex-tripleo-heat-templates.git] / puppet / extraconfig / pre_deploy / controller / neutron-nuage.yaml

diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
index 60f02bf..a4cfea0 100644 (file)
--- a/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
@@ -43,6 +43,11 @@ parameters:
     description: Cloud Management System ID (CMS ID) to distinguish between OS instances on the same VSD
     type: string
 
+  UseForwardedFor:
+    description: Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
+    type: boolean
+    default: false
+
 resources:
   NeutronNuageConfig:
     type: OS::Heat::StructuredConfig
@@ -61,10 +66,12 @@ resources:
                neutron::plugins::nuage::nuage_vsd_organization: {get_input: NuageVSDOrganization}
                neutron::plugins::nuage::nuage_base_uri_version: {get_input: NuageBaseURIVersion}
                neutron::plugins::nuage::nuage_cms_id: {get_input: NuageCMSId}
+               nova::api::use_forwarded_for: {get_input: NovaUseForwardedFor}
 
   NeutronNuageDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: NeutronNuageDeployment
       config: {get_resource: NeutronNuageConfig}
       server: {get_param: server}
       input_values:
@@ -76,6 +83,7 @@ resources:
         NuageVSDOrganization: {get_param: NeutronNuageVSDOrganization}
         NuageBaseURIVersion: {get_param: NeutronNuageBaseURIVersion}
         NuageCMSId: {get_param: NeutronNuageCMSId}
+        NovaUseForwardedFor: {get_param: UseForwardedFor}
 
 outputs:
   deploy_stdout: