openstack/puppet-openstacklib
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: I56603bf6e3dd75d133f296a7fbad93bf09767556
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-14 17:58:11 +09:00
parent 9d3d43d832
commit d31e9bab6d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/openstackclient.pp
View File

@@ -17,7 +17,7 @@ class openstacklib::openstackclient(
$package_ensure = 'present', $package_ensure = 'present',
) inherits openstacklib::params { ) inherits openstacklib::params {
ensure_packages($package_name, { stdlib::ensure_packages($package_name, {
'ensure' => $package_ensure, 'ensure' => $package_ensure,
'tag' => ['openstack', 'openstackclient'] 'tag' => ['openstack', 'openstackclient']
}) })

4
manifests/wsgi/apache.pp
View File

@@ -313,7 +313,7 @@ define openstacklib::wsgi::apache (
mode => '0644', mode => '0644',
} }
$wsgi_daemon_process_options = merge ( $wsgi_daemon_process_options = stdlib::merge(
{ {
user => $user, user => $user,
group => $group, group => $group,
@@ -327,7 +327,7 @@ define openstacklib::wsgi::apache (
$wsgi_script_aliases_default = Hash([$path_real,"${wsgi_script_dir}/${wsgi_script_file}"]) $wsgi_script_aliases_default = Hash([$path_real,"${wsgi_script_dir}/${wsgi_script_file}"])
if $custom_wsgi_script_aliases { if $custom_wsgi_script_aliases {
$wsgi_script_aliases_real = merge($wsgi_script_aliases_default, $custom_wsgi_script_aliases) $wsgi_script_aliases_real = stdlib::merge($wsgi_script_aliases_default, $custom_wsgi_script_aliases)
} else { } else {
$wsgi_script_aliases_real = $wsgi_script_aliases_default $wsgi_script_aliases_real = $wsgi_script_aliases_default
} }

2
metadata.json
View File

@@ -15,7 +15,7 @@
}, },
{ {
"name": "puppetlabs/stdlib", "name": "puppetlabs/stdlib",
"version_requirement": ">=5.0.0 <10.0.0" "version_requirement": ">=9.0.0 <10.0.0"
}, },
{ {
"name": "puppet/rabbitmq", "name": "puppet/rabbitmq",