Add ability to configure glance multiple cinder stores

Adding GlanceCinderVolumeType parameter which is required while
configuring multiple cinder stores as glance backends.

For multiple cinder stores of glance, operator needs to set volume types
for each store and must configure same volume type in cinder as well.

Depends-On: I58df2815e59fe064fe3f0f1d5e1cd35e63d5bdd1
Change-Id: Idd8d265a2931eedbbb51cdfac2da88985ce8e86f

deployment/glance/glance-api-container-puppet.yaml

@@ -241,8 +241,8 @@ parameters:
     description: |
       Dictionary of settings when configuring additional glance backends. The
       hash key is the backend ID, and the value is a dictionary of parameter
-      values unique to that backend. Multiple rbd backends are allowed, but
-      cinder, file and swift backends are limited to one each. Example:
+      values unique to that backend. Multiple rbd and cinder backends are allowed, but
+      file and swift backends are limited to one each. Example:
         # Default glance store is rbd.
         GlanceBackend: rbd
         GlanceStoreDescription: 'Default rbd store'
@@ -256,15 +256,28 @@ parameters:
             # Override CephClientUserName if this cluster uses a different
             # client name.
             CephClientUserName: client2
-          cinder_store:
+          cinder1_store:
             GlanceBackend: cinder
-            GlanceStoreDescription: 'Cinder store'
+            GlanceCinderVolumeType: 'volume-type-1'
+            GlanceStoreDescription: 'First cinder store'
+          cinder2_store:
+            GlanceBackend: cinder
+            GlanceCinderVolumeType: 'volume-type-2'
+            GlanceStoreDescription: 'Seconde cinder store'
   GlanceCinderMountPointBase:
     default: '/var/lib/glance/mnt'
     type: string
     description: |
       The mount point base when glance is using cinder as store and cinder backend
       is NFS. This mount point is where the NFS volume is mounted on the glance node.
+  GlanceCinderVolumeType:
+    default: ''
+    type: string
+    description: |
+      A unique volume type required for each cinder store while configuring multiple cinder
+      stores as glance backends. The same volume types must be configured in Cinder as well.
+      The volume type must exist in cinder prior to any attempt to add an image in the associated
+      cinder store. If no volume type is specified then cinder's default volume type will be used.
   CephClientUserName:
     default: openstack
     type: string
@@ -502,7 +515,9 @@ outputs:
               glance::backend::cinder::cinder_store_user_name: 'glance'
               glance::backend::cinder::cinder_store_password: {get_param: GlancePassword}
               tripleo::profile::base::glance::backend::cinder::cinder_mount_point_base: {get_param: GlanceCinderMountPointBase}
-          - if:
+              tripleo::profile::base::glance::backend::cinder::cinder_volume_type: {get_param: GlanceCinderVolumeType}
+          -
+            if:
             - cinder_multipathd_enabled
             - glance::backend::cinder::cinder_use_multipath: true
           - if:

deployment/nova/nova-compute-container-puppet.yaml

@@ -668,8 +668,8 @@ parameters:
     description: |
       Dictionary of settings when configuring additional glance backends. The
       hash key is the backend ID, and the value is a dictionary of parameter
-      values unique to that backend. Multiple rbd backends are allowed, but
-      cinder, file and swift backends are limited to one each. Example:
+      values unique to that backend. Multiple rbd and cinder backends are allowed, but
+      file and swift backends are limited to one each. Example:
         # Default glance store is rbd.
         GlanceBackend: rbd
         GlanceStoreDescription: 'Default rbd store'
@@ -683,9 +683,14 @@ parameters:
             # Override CephClientUserName if this cluster uses a different
             # client name.
             CephClientUserName: client2
-          cinder_store:
+          cinder1_store:
             GlanceBackend: cinder
-            GlanceStoreDescription: 'Cinder store'
+            GlanceCinderVolumeType: 'volume-type-1'
+            GlanceStoreDescription: 'First cinder store'
+          cinder2_store:
+            GlanceBackend: cinder
+            GlanceCinderVolumeType: 'volume-type-2'
+            GlanceStoreDescription: 'Seconde cinder store'
   NovaGlanceEnableRbdDownload:
     type: boolean
     description: >

releasenotes/notes/add_glance_cinder_volume_type_to_configure_multiple_cinder_stores-74eea265ee795660.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new paramerter GlanceCinderVolumeType parameter has been added which
+    is required while configuring multiple cinder stores as glance backends.