diff options
| author |   Alan Bishop <abishop@redhat.com> | 2017-10-11 11:02:43 -0400 |
|---|---|---|
| committer | Alan Bishop <abishop@redhat.com> | 2017-10-29 10:12:24 -0400 |
| commit | 94c624c30ca68328e3331717d2961dc969dcddd0 (patch) | |
| tree | 954e3601970516a216923ccbb8b36e2674ce8bd1 /docker | |
| parent | 9dfec11795703b43991e06ef880b52cd0b3a5eb4 (diff) | |
Enable Cinder as a backend for Glance
Enable Cinder as a backend for Glance by adding 'cinder' to the list of
allowed choices for the GlanceBackend heat parameter.
Update the glance-api docker configuration to allow the feature to work.
This is necessary because the feature uses iSCSI, which requires additional
privileges.
Closes-Bug: #1728409
Depends-On: I850047e32f3608b3ce490e52e2e540695cb1a4ff
Change-Id: I42241747de931103a04aa5ee2ed18fd46197d183
(cherry picked from commit e828e8c7bb2e890b243faa767992226dc270bb6f)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/glance-api.yaml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index e1a3827a..d56c422f 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -39,6 +39,13 @@ parameters: EnableInternalTLS: type: boolean default: false + GlanceBackend: + default: swift + description: The short name of the Glance backend to use. Should be one + of swift, rbd, cinder, or file + type: string + constraints: + - allowed_values: ['swift', 'file', 'rbd', 'cinder'] GlanceNfsEnabled: default: false description: > @@ -53,6 +60,7 @@ conditions: internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} nfs_backend_enabled: {equals: [{get_param: GlanceNfsEnabled}, true]} + cinder_backend_enabled: {equals: [{get_param: GlanceBackend}, cinder]} resources: @@ -147,6 +155,12 @@ outputs: - nfs_backend_enabled - /var/lib/glance:/var/lib/glance - '' + - + if: + - cinder_backend_enabled + - - /dev:/dev + - /etc/iscsi:/etc/iscsi + - [] environment: - KOLLA_BOOTSTRAP=True - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS @@ -157,7 +171,7 @@ outputs: start_order: 2 image: *glance_api_image net: host - privileged: false + privileged: {if: [cinder_backend_enabled, true, false]} restart: always volumes: *glance_volumes environment: |