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
This commit is contained in:
Giulio Fidente 2016-10-11 12:51:44 +02:00
parent ca91ce746f
commit 4794154d71
3 changed files with 29 additions and 1 deletions

View File

@ -1,4 +1,4 @@
heat_template_version: 2016-04-08 heat_template_version: 2016-10-14
description: > description: >
Ceph base service. Shared by all Ceph services. Ceph base service. Shared by all Ceph services.
@ -29,9 +29,20 @@ parameters:
GlanceRbdPoolName: GlanceRbdPoolName:
default: images default: images
type: string 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: GnocchiRbdPoolName:
default: metrics default: metrics
type: string type: string
NovaEnableRbdBackend:
default: false
description: Whether to enable or not the Rbd backend for Nova
type: boolean
NovaRbdPoolName: NovaRbdPoolName:
default: vms default: vms
type: string type: string
@ -63,6 +74,16 @@ parameter_groups:
parameters: parameters:
- ControllerEnableCephStorage - ControllerEnableCephStorage
conditions:
glance_multiple_locations:
and:
- equals:
- get_param: GlanceBackend
- rbd
- equals:
- get_param: NovaEnableRbdBackend
- false
outputs: outputs:
role_data: role_data:
description: Role data for the Ceph base service. description: Role data for the Ceph base service.
@ -128,3 +149,6 @@ outputs:
CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName} CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
GLANCE_POOL: {get_param: GlanceRbdPoolName} GLANCE_POOL: {get_param: GlanceRbdPoolName}
GNOCCHI_POOL: {get_param: GnocchiRbdPoolName} GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
service_config_settings:
glance_api:
glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}

View File

@ -78,5 +78,7 @@ outputs:
CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName} CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
GLANCE_POOL: {get_param: GlanceRbdPoolName} GLANCE_POOL: {get_param: GlanceRbdPoolName}
GNOCCHI_POOL: {get_param: GnocchiRbdPoolName} GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
service_config_settings:
get_attr: [CephBase, role_data, service_config_settings]
step_config: | step_config: |
include ::tripleo::profile::base::ceph::client include ::tripleo::profile::base::ceph::client

View File

@ -101,5 +101,7 @@ outputs:
'110 ceph_mon': '110 ceph_mon':
dport: dport:
- 6789 - 6789
service_config_settings:
get_attr: [CephBase, role_data, service_config_settings]
step_config: | step_config: |
include ::tripleo::profile::base::ceph::mon include ::tripleo::profile::base::ceph::mon