Browse Source

Add missing glance parameter required for cinder store

For cinder backend of glance, to make the Image-Volume in the
internal project accessible from the Image service, few parameters
needs to be set in glance-api.conf.

In patch[1], support of few parameters is already added but
'cinder_store_auth_address' is missed out somehow, which is for
valid authentication service address. So, adding it in this patch.

[1]: https://review.openstack.org/#/c/626847/

Closes-Bug: #1809104
Change-Id: Ib19958577cdc4b829601018114ee0f564778c4da
(cherry picked from commit e51177e296)
changes/39/634939/1
Pranali Deore 3 years ago
parent
commit
4e2d869f12
  1. 7
      manifests/backend/cinder.pp
  2. 3
      releasenotes/notes/add-missing-cinder-store-settings-f7aef33ec122a39a.yaml
  3. 5
      spec/classes/glance_backend_cinder_spec.rb

7
manifests/backend/cinder.pp

@ -52,6 +52,10 @@
# Should be a valid boolean value
# Defaults to $::os_service_default.
#
# [*cinder_store_auth_address*]
# (optional) A valid authentication service address.
# Defaults to $::os_service_default.
#
# [*cinder_store_project_name*]
# (optional) Project name where the image volume is stored in cinder.
# Defaults to $::os_service_default.
@ -75,6 +79,7 @@ class glance::backend::cinder(
$cinder_catalog_info = $::os_service_default,
$cinder_endpoint_template = $::os_service_default,
$cinder_http_retries = $::os_service_default,
$cinder_store_auth_address = $::os_service_default,
$cinder_store_project_name = $::os_service_default,
$cinder_store_user_name = $::os_service_default,
$cinder_store_password = $::os_service_default,
@ -93,6 +98,7 @@ class glance::backend::cinder(
'glance_store/cinder_http_retries': value => $cinder_http_retries;
'glance_store/cinder_endpoint_template': value => $cinder_endpoint_template;
'glance_store/cinder_ca_certificates_file': value => $cinder_ca_certificates_file;
'glance_store/cinder_store_auth_address': value => $cinder_store_auth_address;
'glance_store/cinder_store_project_name': value => $cinder_store_project_name;
'glance_store/cinder_store_user_name': value => $cinder_store_user_name;
'glance_store/cinder_store_password': value => $cinder_store_password;
@ -108,6 +114,7 @@ class glance::backend::cinder(
'glance_store/cinder_http_retries': value => $cinder_http_retries;
'glance_store/cinder_endpoint_template': value => $cinder_endpoint_template;
'glance_store/cinder_ca_certificates_file': value => $cinder_ca_certificates_file;
'glance_store/cinder_store_auth_address': value => $cinder_store_auth_address;
'glance_store/cinder_store_project_name': value => $cinder_store_project_name;
'glance_store/cinder_store_user_name': value => $cinder_store_user_name;
'glance_store/cinder_store_password': value => $cinder_store_password;

3
releasenotes/notes/add-missing-cinder-store-settings-f7aef33ec122a39a.yaml

@ -9,3 +9,6 @@ features:
Add new parameter 'cinder_store_password', for valid password
for the user specified by 'cinder_store_user_name'
Add new parameter 'cinder_store_auth_address', for valid
authentication service address.

5
spec/classes/glance_backend_cinder_spec.rb

@ -38,6 +38,7 @@ describe 'glance::backend::cinder' do
is_expected.to contain_glance_api_config('glance_store/cinder_http_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('glance_store/cinder_ca_certificates_file').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('glance_store/cinder_endpoint_template').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('glance_store/cinder_store_auth_address').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('glance_store/cinder_store_project_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('glance_store/cinder_store_user_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('glance_store/cinder_store_password').with_value('<SERVICE DEFAULT>')
@ -48,6 +49,7 @@ describe 'glance::backend::cinder' do
is_expected.to contain_glance_cache_config('glance_store/cinder_http_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('glance_store/cinder_ca_certificates_file').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('glance_store/cinder_endpoint_template').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_auth_address').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_project_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_user_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_password').with_value('<SERVICE DEFAULT>')
@ -62,6 +64,7 @@ describe 'glance::backend::cinder' do
:cinder_catalog_info => 'volume:cinder:internalURL',
:cinder_endpoint_template => 'http://srv-foo:8776/v1/%(project_id)s',
:cinder_http_retries => '10',
:cinder_store_auth_address => '127.0.0.2:8080/v3/',
:cinder_store_project_name => 'services',
:cinder_store_user_name => 'glance',
:cinder_store_password => 'glance',
@ -73,6 +76,7 @@ describe 'glance::backend::cinder' do
is_expected.to contain_glance_api_config('glance_store/cinder_catalog_info').with_value('volume:cinder:internalURL')
is_expected.to contain_glance_api_config('glance_store/cinder_endpoint_template').with_value('http://srv-foo:8776/v1/%(project_id)s')
is_expected.to contain_glance_api_config('glance_store/cinder_http_retries').with_value('10')
is_expected.to contain_glance_api_config('glance_store/cinder_store_auth_address').with_value('127.0.0.2:8080/v3/')
is_expected.to contain_glance_api_config('glance_store/cinder_store_project_name').with_value('services')
is_expected.to contain_glance_api_config('glance_store/cinder_store_user_name').with_value('glance')
is_expected.to contain_glance_api_config('glance_store/cinder_store_password').with_value('glance')
@ -83,6 +87,7 @@ describe 'glance::backend::cinder' do
is_expected.to contain_glance_cache_config('glance_store/cinder_catalog_info').with_value('volume:cinder:internalURL')
is_expected.to contain_glance_cache_config('glance_store/cinder_endpoint_template').with_value('http://srv-foo:8776/v1/%(project_id)s')
is_expected.to contain_glance_cache_config('glance_store/cinder_http_retries').with_value('10')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_auth_address').with_value('127.0.0.2:8080/v3/')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_project_name').with_value('services')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_user_name').with_value('glance')
is_expected.to contain_glance_cache_config('glance_store/cinder_store_password').with_value('glance')

Loading…
Cancel
Save