openstack/puppet-glance
Code Issues Proposed changes

Switch to namespace sdtlib functions

Browse Source 
puppetlabs-stdlib deprecated the existing functions in favor of
the new stdlib:: functions in 9.0.0. The version was released a few
years ago and now we assume we are ready to adopt to the migration.

Change-Id: Iceb0be07fa808f2016c4939bf7444ed6d9f09260
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-14 18:03:55 +09:00
parent 6165e24030
commit 88d0d028d9
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@@ -502,8 +502,8 @@ enabled_backends instead.')
}
}
create_resources('glance_api_config', merge($default_store_opt, $stores_opt))
create_resources('glance_cache_config', merge($default_store_opt, $stores_opt))
create_resources('glance_api_config', stdlib::merge($default_store_opt, $stores_opt))
create_resources('glance_cache_config', stdlib::merge($default_store_opt, $stores_opt))
} else {
warning('Glance-api is being provisioned without any backends')

2
manifests/backend/multistore/rbd.pp
View File

@@ -96,7 +96,7 @@ define glance::backend::multistore::rbd(
}
if $manage_packages {
ensure_packages('python-ceph', {
stdlib::ensure_packages('python-ceph', {
ensure => $package_ensure,
name => $::glance::params::pyceph_package_name,
tag => ['openstack', 'glance-support-package'],

2
manifests/backend/multistore/s3.pp
View File

@@ -96,7 +96,7 @@ define glance::backend::multistore::s3(
include glance::params
if $manage_packages {
ensure_packages('python-boto3', {
stdlib::ensure_packages('python-boto3', {
'ensure' => $package_ensure,
'name' => $::glance::params::boto3_package_name,
'tag' => ['openstack','glance-package'],

2
manifests/property_protection.pp
View File

@@ -56,7 +56,7 @@ class glance::property_protection(
create_resources(
'glance_property_protections_config',
{ $key => merge($value, $value_override)}
{ $key => stdlib::merge($value, $value_override)}
)
}

2
metadata.json
View File

@@ -11,7 +11,7 @@
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">=5.0.0 <10.0.0"
"version_requirement": ">=9.0.0 <10.0.0"
},
{
"name": "openstack/swift",