diff options
| author |   Brent Eagles <beagles@redhat.com> | 2017-01-25 17:57:12 -0330 |
|---|---|---|
| committer |   Alex Schultz <aschultz@redhat.com> | 2017-04-07 10:58:35 -0600 |
| commit | 60e3687075b4968f208ecbc0e24bd4e318c72380 (patch) | |
| tree | 0d6754e7059b042a789ad20235622271e5f47395 /puppet/services/glance-api.yaml | |
| parent | e221203da48c329147894923272d335560848fc2 (diff) | |
Use conditionals for neutron and glance worker defaults
Using an empty string to signal that the default value in the puppet module
is to be used no longer seems to work, resulting in the puppet specified
defaults being overridden by empty string values. The impact on
configuration will differ depending on the actual configuration item, the
puppet code and the service, so it is just safer to omit the hieradata if
the user has not explicitly set a value.
Change-Id: Iefbc8f8669680e4f9d01db6b49543bfbe9b7661b
Closes-Bug: #1669452
Diffstat (limited to 'puppet/services/glance-api.yaml')
| -rw-r--r-- | puppet/services/glance-api.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index f61e6154..9cc85958 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -119,6 +119,7 @@ parameters: conditions: use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]} + glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']} resources: @@ -160,7 +161,6 @@ outputs: glance::api::authtoken::password: {get_param: GlancePassword} glance::api::enable_proxy_headers_parsing: true glance::api::debug: {get_param: Debug} - glance::api::workers: {get_param: GlanceWorkers} glance::policy::policies: {get_param: GlanceApiPolicies} tripleo.glance_api.firewall_rules: '112 glance_api': @@ -210,6 +210,11 @@ outputs: tripleo::profile::base::glance::api::glance_nfs_enabled: {get_param: GlanceNfsEnabled} tripleo::glance::nfs_mount::share: {get_param: GlanceNfsShare} tripleo::glance::nfs_mount::options: {get_param: GlanceNfsOptions} + - + if: + - glance_workers_unset + - {} + - glance::api::workers: {get_param: GlanceWorkers} service_config_settings: keystone: glance::keystone::auth::public_url: {get_param: [EndpointMap, GlancePublic, uri]} |