openstack
/
puppet-glance
Code Issues Proposed changes

Remove deprecated glance::os_region_name 

It was deprecated during Ussuri cycle by [1].

[1] 9e82f598ad

Change-Id: Iab8fe79beedbe8cae0a5e6f6bd7c8a0b2d1e74c0
This commit is contained in:
Takashi Kajinami 2022-08-16 22:41:02 +09:00
parent 3c24186052
commit b91d905887
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/api.pp
View File

@ -247,10 +247,6 @@
# properties.
# Defaults to undef
#
# [*os_region_name*]
# (optional) Sets the keystone region to use.
# Defaults to undef
#
# [*keymgr_backend*]
# (optional) Key Manager service class.
# Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager
@ -366,7 +362,6 @@ class glance::api(
$default_store = undef,
$multi_store = false,
$show_multiple_locations = undef,
$os_region_name = undef,
$keymgr_backend = undef,
$keymgr_encryption_api_url = undef,
$keymgr_encryption_auth_url = undef,
@ -385,11 +380,6 @@ class glance::api(
include glance::policy
include glance::api::db
if $os_region_name != undef {
warning('glance::api::os_region_name is deprecated. Use \
glance::backend::multistore::cinder::cinder_os_region_name instead.')
}
if $validate != undef {
warning('The glance::api::validate parameter has been deprecated and has no effect')
}

5
manifests/backend/cinder.pp
View File

@ -89,9 +89,6 @@ class glance::backend::cinder(
warning('glance::backend::cinder is deprecated. Use glance::backend::multistore::cinder instead.')
# to keep backwards compatibility
$cinder_os_region_name_real = pick($::glance::api::os_region_name, $cinder_os_region_name)
glance::backend::multistore::cinder { 'glance_store':
cinder_api_insecure => $cinder_api_insecure,
cinder_catalog_info => $cinder_catalog_info,
@ -102,7 +99,7 @@ class 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_real,
cinder_os_region_name => $cinder_os_region_name,
store_description => undef,
}

7
manifests/backend/multistore/cinder.pp
View File

@ -117,9 +117,6 @@ define glance::backend::multistore::cinder(
include glance::deps
# to keep backwards compatibility
$cinder_os_region_name_real = pick($::glance::api::os_region_name, $cinder_os_region_name)
glance_api_config {
"${name}/cinder_api_insecure": value => $cinder_api_insecure;
"${name}/cinder_catalog_info": value => $cinder_catalog_info;
@ -132,7 +129,7 @@ define glance::backend::multistore::cinder(
"${name}/cinder_store_password": value => $cinder_store_password, secret => true;
"${name}/cinder_store_user_domain_name": value => $cinder_store_user_domain_name;
"${name}/cinder_store_project_domain_name": value => $cinder_store_project_domain_name;
"${name}/cinder_os_region_name": value => $cinder_os_region_name_real;
"${name}/cinder_os_region_name": value => $cinder_os_region_name;
"${name}/cinder_volume_type": value => $cinder_volume_type;
"${name}/cinder_enforce_multipath": value => $cinder_enforce_multipath;
"${name}/cinder_use_multipath": value => $cinder_use_multipath;
@ -152,7 +149,7 @@ define glance::backend::multistore::cinder(
"${name}/cinder_store_password": value => $cinder_store_password, secret => true;
"${name}/cinder_store_project_domain_name": value => $cinder_store_project_domain_name;
"${name}/cinder_store_user_domain_name": value => $cinder_store_user_domain_name;
"${name}/cinder_os_region_name": value => $cinder_os_region_name_real;
"${name}/cinder_os_region_name": value => $cinder_os_region_name;
"${name}/cinder_volume_type": value => $cinder_volume_type;
"${name}/cinder_enforce_multipath": value => $cinder_enforce_multipath;
"${name}/cinder_mount_point_base": value => $cinder_mount_point_base;

4
releasenotes/notes/remove-os_region_name-892f99fd3ff5027b.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``glance::api::os_region_name`` parameter has been removed.