Merge "Enable Cinder as a backend for Glance" into stable/pike

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:

environments/storage/enable-ceph.yaml

@@ -21,7 +21,7 @@ parameter_defaults:
   # Type: boolean
   CinderEnableRbdBackend: True
 
-  # The short name of the Glance backend to use. Should be one of swift, rbd, or file
+  # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file
   # Type: string
   GlanceBackend: rbd
 

environments/storage/external-ceph.yaml

@@ -43,7 +43,7 @@ parameter_defaults:
   # Type: string
   CinderRbdPoolName: volumes
 
-  # The short name of the Glance backend to use. Should be one of swift, rbd, or file
+  # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file
   # Type: string
   GlanceBackend: rbd
 

environments/storage/glance-nfs.yaml

@@ -21,7 +21,7 @@ parameter_defaults:
   # Static parameters - these are values that must be
   # included in the environment but should not be changed.
   # ******************************************************
-  # The short name of the Glance backend to use. Should be one of swift, rbd, or file
+  # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file
   # Type: string
   GlanceBackend: file
 

puppet/services/glance-api.yaml

@@ -78,10 +78,10 @@ parameters:
   GlanceBackend:
     default: swift
     description: The short name of the Glance backend to use. Should be one
-      of swift, rbd, or file
+      of swift, rbd, cinder, or file
     type: string
     constraints:
-    - allowed_values: ['swift', 'file', 'rbd']
+    - allowed_values: ['swift', 'file', 'rbd', 'cinder']
   GlanceNfsEnabled:
     default: false
     description: >