diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 916b6342c0..e7ce7f7302 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/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: diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index c02078a064..2132bb011e 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/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: > diff --git a/releasenotes/notes/add_glance_cinder_volume_type_to_configure_multiple_cinder_stores-74eea265ee795660.yaml b/releasenotes/notes/add_glance_cinder_volume_type_to_configure_multiple_cinder_stores-74eea265ee795660.yaml new file mode 100644 index 0000000000..8e80ffcdb6 --- /dev/null +++ b/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.