diff --git a/manifests/openstackclient.pp b/manifests/openstackclient.pp index eee68760..ef209393 100644 --- a/manifests/openstackclient.pp +++ b/manifests/openstackclient.pp @@ -17,7 +17,7 @@ class openstacklib::openstackclient( $package_ensure = 'present', ) inherits openstacklib::params { - ensure_packages($package_name, { + stdlib::ensure_packages($package_name, { 'ensure' => $package_ensure, 'tag' => ['openstack', 'openstackclient'] }) diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 01d370d9..043cba49 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -313,7 +313,7 @@ define openstacklib::wsgi::apache ( mode => '0644', } - $wsgi_daemon_process_options = merge ( + $wsgi_daemon_process_options = stdlib::merge( { user => $user, group => $group, @@ -327,7 +327,7 @@ define openstacklib::wsgi::apache ( $wsgi_script_aliases_default = Hash([$path_real,"${wsgi_script_dir}/${wsgi_script_file}"]) 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 { $wsgi_script_aliases_real = $wsgi_script_aliases_default } diff --git a/metadata.json b/metadata.json index 2904ca14..a42402cd 100644 --- a/metadata.json +++ b/metadata.json @@ -15,7 +15,7 @@ }, { "name": "puppetlabs/stdlib", - "version_requirement": ">=5.0.0 <10.0.0" + "version_requirement": ">=9.0.0 <10.0.0" }, { "name": "puppet/rabbitmq",