diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-08 05:15:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-08 05:15:21 +0000 |
| commit | 6ae90da66d6125be58651e680f1fb603134087fe (patch) | |
| tree | 1e24d0b6bcfb27b319a8210a7f77c543092ea642 /docker/services | |
| parent | 07ac3d18fdc50714c1627a828657ddb383d9f23b (diff) | |
| parent | 94c624c30ca68328e3331717d2961dc969dcddd0 (diff) | |
Merge "Enable Cinder as a backend for Glance" into stable/pike
Diffstat (limited to 'docker/services')
| -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 1a6f5c77..b4336bea 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: > @@ -63,6 +70,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: @@ -161,6 +169,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 @@ -171,7 +185,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: |