diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-02 15:16:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-02 15:16:58 +0000 |
| commit | 368b3eadda577f9914d181893df2df96367e8fad (patch) | |
| tree | 46524435a66fca83fd59ee48df1120793cb784e9 /puppet/services/glance-api.yaml | |
| parent | c5dbe7437fcdd7f41ec5b04c347c5c849e6ad3cf (diff) | |
| parent | 43edc49a04dd1ed64bbe258593dffe3640c2874e (diff) | |
Merge "Move glance::api::show_multiple_locations within GlanceApi"
Diffstat (limited to 'puppet/services/glance-api.yaml')
| -rw-r--r-- | puppet/services/glance-api.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index 7812c8e2..a3d5a793 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -96,6 +96,10 @@ parameters: GlanceRbdPoolName: default: images type: string + NovaEnableRbdBackend: + default: false + description: Whether to enable or not the Rbd backend for Nova + type: boolean RabbitPassword: description: The password for RabbitMQ type: string @@ -129,6 +133,14 @@ conditions: use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]} glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']} service_debug_unset: {equals : [{get_param: GlanceDebug}, '']} + glance_multiple_locations: + and: + - equals: + - get_param: GlanceBackend + - rbd + - equals: + - get_param: NovaEnableRbdBackend + - true resources: @@ -187,6 +199,7 @@ outputs: glance::keystone::authtoken::project_domain_name: 'Default' glance::api::pipeline: 'keystone' glance::api::show_image_direct_url: true + glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]} # NOTE: bind IP is found in Heat replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api): |