openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Parameterizes Nova API default floating IP pool"

This commit is contained in:
Jenkins 2017-01-18 10:45:48 +00:00 committed by Gerrit Code Review
parent a83fca48f2 c3d69c174b
commit 44c3f88102
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/services/nova-api.yaml
View File

@ -54,6 +54,10 @@ parameters:
EnableInternalTLS:
type: boolean
default: false
NovaDefaultFloatingPool:
default: 'public'
description: Default pool for floating IP addresses
type: string
conditions:
nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
@ -102,7 +106,7 @@ outputs:
nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
nova::api::enabled: true
nova::api::default_floating_pool: 'public'
nova::api::default_floating_pool: {get_param: NovaDefaultFloatingPool}
nova::api::sync_db_api: true
nova::api::enable_proxy_headers_parsing: true
nova::api::api_bind_address: