Merge "Change for configuring use_forwarded_for value for Nuage"

This commit is contained in:
Jenkins 2015-12-08 12:21:45 +00:00 committed by Gerrit Code Review
commit 2674efae84
2 changed files with 8 additions and 0 deletions

View File

@ -12,3 +12,4 @@ parameter_defaults:
NeutronNuageVSDOrganization: 'organization'
NeutronNuageBaseURIVersion: 'default_uri_version'
NeutronNuageCMSId: ''
UseForwardedFor: true

View File

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