summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-18 10:45:48 +0000
committerGerrit Code Review <review@openstack.org>2017-01-18 10:45:48 +0000
commit44c3f881027341926224b07de6294633402440fc (patch)
tree10a4fb3459fee7c37ff58fffac39005e7ae7e0f0 /puppet
parenta83fca48f2800c09172a2c2c1204afaccefc6639 (diff)
parentc3d69c174beb309c955bd5b00bd075f4273237a3 (diff)
Merge "Parameterizes Nova API default floating IP pool"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/nova-api.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index d2ca841f..36ac3e08 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -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: