openstack
/
puppet-tripleo
Code Issues Proposed changes

Glance: Add support for cinder_os_region_name 

... so that we can replace the deprecated os_region_name parameter.

Depends-on: https://review.opendev.org/719338
Change-Id: I618f915fcba9c0151c039a22dbad5b48a6da1e77
This commit is contained in:
Takashi Kajinami 2021-08-23 08:49:32 +09:00
parent b62365e5f3
commit 414ff9b0f5
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/profile/base/glance/backend/cinder.pp
View File

@ -61,6 +61,10 @@
# (Optional) A valid password for the user specified by `cinder_store_user_name'
# Defaults to hiera('glance::backend::cinder::cinder_store_password', undef)
#
# [*cinder_os_region_name*]
# (optional) Sets the keystone region to use.
# Defaults to hiera('glance::backend::cinder::cinder_os_region_name', undef)
#
# [*cinder_enforce_multipath*]
# (Optional) Set to True when multipathd is enabled
# Defaults to hiera('glance::backend::cinder::cinder_enforce_multipath', undef)
@ -99,6 +103,7 @@ class tripleo::profile::base::glance::backend::cinder (
$cinder_store_project_name = hiera('glance::backend::cinder::cinder_store_project_name', undef),
$cinder_store_user_name = hiera('glance::backend::cinder::cinder_store_user_name', undef),
$cinder_store_password = hiera('glance::backend::cinder::cinder_store_password', undef),
$cinder_os_region_name = hiera('glance::backend::cinder::cinder_os_region_name', undef),
$cinder_enforce_multipath = hiera('glance::backend::cinder::cinder_enforce_multipath', undef),
$cinder_use_multipath = hiera('glance::backend::cinder::cinder_use_multipath', undef),
$cinder_mount_point_base = hiera('glance::backend::cinder::cinder_mount_point_base', undef),
@ -129,6 +134,7 @@ class tripleo::profile::base::glance::backend::cinder (
'cinder_store_project_name' => $cinder_store_project_name,
'cinder_store_user_name' => $cinder_store_user_name,
'cinder_store_password' => $cinder_store_password,
'cinder_os_region_name' => $cinder_os_region_name,
'cinder_enforce_multipath' => $cinder_enforce_multipath,
'cinder_use_multipath' => $cinder_use_multipath,
'cinder_mount_point_base' => $cinder_mount_point_base,

2
spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
View File

@ -46,6 +46,7 @@ describe 'tripleo::profile::base::glance::backend::cinder' do
:cinder_store_project_name => 'services',
:cinder_store_user_name => 'glance',
:cinder_store_password => 'glance_password',
:cinder_os_region_name => 'regionOne',
:cinder_enforce_multipath => true,
:cinder_use_multipath => true,
:cinder_mount_point_base => '/var/lib/glance/mnt/nfs',
@ -66,6 +67,7 @@ describe 'tripleo::profile::base::glance::backend::cinder' do
:cinder_store_project_name => 'services',
:cinder_store_user_name => 'glance',
:cinder_store_password => 'glance_password',
:cinder_os_region_name => 'regionOne',
:cinder_enforce_multipath => true,
:cinder_use_multipath => true,
:cinder_mount_point_base => '/var/lib/glance/mnt/nfs',