aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-08 12:21:45 +0000
committerGerrit Code Review <review@openstack.org>2015-12-08 12:21:45 +0000
commit2674efae84f6ba808fbaa5f0150825e42a86ba59 (patch)
tree6751aba2d7a79976bf77ae3fd4aa131ea0644451 /puppet/extraconfig
parent10b6bb97133eb36ef0185fd903b3f112cd70a5db (diff)
parent8337b69bc9f21b85accb683009bbc872c00340e0 (diff)
Merge "Change for configuring use_forwarded_for value for Nuage"
Diffstat (limited to 'puppet/extraconfig')
-rw-r--r--puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
index 60f02bf8..8378d2fc 100644
--- 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,6 +66,7 @@ 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
@@ -76,6 +82,7 @@ resources:
NuageVSDOrganization: {get_param: NeutronNuageVSDOrganization}
NuageBaseURIVersion: {get_param: NeutronNuageBaseURIVersion}
NuageCMSId: {get_param: NeutronNuageCMSId}
+ NovaUseForwardedFor: {get_param: UseForwardedFor}
outputs:
deploy_stdout: