diff options
author | Giulio Fidente <gfidente@redhat.com> | 2016-11-02 12:13:18 +0100 |
---|---|---|
committer | Giulio Fidente <gfidente@redhat.com> | 2016-11-02 12:15:24 +0100 |
commit | ba66980aa3d1fd981363173803e926642dc66227 (patch) | |
tree | 1b356a6da6b068ddc7369e55860dce1f1ce5cbec | |
parent | d106161466ca158e4b663a89beda7af1d5b67d72 (diff) |
Do not reference CephBase from CephExternal service
We want CephExternal to work without referencing CephBase which
instead defines common settings for hosted Ceph deployments.
This change fixes a reference to CephBase which was mistakenly
introduced with fix for bug #1632285.
Change-Id: Id27e935f91ad76a6877b3aa7588f54d6140aa41f
Closes-Bug: #1635014
-rw-r--r-- | puppet/services/ceph-external.yaml | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index 7d75074c..9120687b 100644 --- a/puppet/services/ceph-external.yaml +++ b/puppet/services/ceph-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-04-08 +heat_template_version: 2016-10-14 description: > Ceph External service. @@ -27,9 +27,20 @@ parameters: GlanceRbdPoolName: default: images type: string + GlanceBackend: + default: swift + description: The short name of the Glance backend to use. Should be one + of swift, rbd, or file + type: string + constraints: + - allowed_values: ['swift', 'file', 'rbd'] GnocchiRbdPoolName: default: metrics type: string + NovaEnableRbdBackend: + default: false + description: Whether to enable or not the Rbd backend for Nova + type: boolean NovaRbdPoolName: default: vms type: string @@ -51,6 +62,16 @@ parameters: default: 'overcloud-ceph-external' type: string +conditions: + glance_multiple_locations: + and: + - equals: + - get_param: GlanceBackend + - rbd + - equals: + - get_param: NovaEnableRbdBackend + - true + outputs: role_data: description: Role data for the Ceph External service. @@ -79,6 +100,7 @@ outputs: GLANCE_POOL: {get_param: GlanceRbdPoolName} GNOCCHI_POOL: {get_param: GnocchiRbdPoolName} service_config_settings: - get_attr: [CephBase, role_data, service_config_settings] + glance_api: + glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]} step_config: | include ::tripleo::profile::base::ceph::client |