diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-10-11 12:51:44 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-10-13 22:47:07 +0200 |
| commit | 4794154d71a7a566bb0c75cb8e0b4adb5fc52bfd (patch) | |
| tree | 8addf60a51ad975ec5d969f74cfcbf658ba5627b /puppet/services/ceph-base.yaml | |
| parent | ca91ce746fab61c6c13d16e8928fc09003e2bc4c (diff) | |
Enable Glance multiple locations when using Ceph
Currently Glance v2 doesn't allow to specify custom locations for
images by default, it returns 403. To enable this, the
'show_multiple_locations' param must be set to True.
Also see similar change introduced in devstack [1].
1. Id0f1c398b8b48f2ffc2488b29bc7cbd279069337
Change-Id: Ia7e0558e4f318640981abb44d188e3479b5eae69
Closes-Bug: 1632285
Diffstat (limited to 'puppet/services/ceph-base.yaml')
| -rw-r--r-- | puppet/services/ceph-base.yaml | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index adb17b26..71d81dc2 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-04-08 +heat_template_version: 2016-10-14 description: > Ceph base service. Shared by all Ceph services. @@ -29,9 +29,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 @@ -63,6 +74,16 @@ parameter_groups: parameters: - ControllerEnableCephStorage +conditions: + glance_multiple_locations: + and: + - equals: + - get_param: GlanceBackend + - rbd + - equals: + - get_param: NovaEnableRbdBackend + - false + outputs: role_data: description: Role data for the Ceph base service. @@ -128,3 +149,6 @@ outputs: CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName} GLANCE_POOL: {get_param: GlanceRbdPoolName} GNOCCHI_POOL: {get_param: GnocchiRbdPoolName} + service_config_settings: + glance_api: + glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]} |