diff --git a/manifests/task_flow.pp b/manifests/task_flow.pp index b18982b3..d1c16fef 100644 --- a/manifests/task_flow.pp +++ b/manifests/task_flow.pp @@ -156,7 +156,7 @@ class octavia::task_flow ( if $manage_backend_package { case $jobboard_backend_driver { 'zookeeper_taskflow_driver': { - ensure_packages('python-kazoo', { + stdlib::ensure_packages('python-kazoo', { name => $::octavia::params::python_kazoo_package_name, ensure => $package_ensure, tag => ['openstack'], @@ -166,7 +166,7 @@ class octavia::task_flow ( -> Anchor['octavia::install::end'] } 'etcd_taskflow_driver': { - ensure_packages('python-etcd3gw', { + stdlib::ensure_packages('python-etcd3gw', { name => $::octavia::params::python_etcd3gw_package_name, ensure => $package_ensure, tag => ['openstack'], @@ -176,7 +176,7 @@ class octavia::task_flow ( -> Anchor['octavia::install::end'] } default: { - ensure_packages('python-redis', { + stdlib::ensure_packages('python-redis', { name => $::octavia::params::python_redis_package_name, ensure => $package_ensure, tag => ['openstack'], diff --git a/manifests/worker.pp b/manifests/worker.pp index da65bd2d..9e55d472 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -84,7 +84,7 @@ class octavia::worker ( 'is_public' => false, 'tag' => ['octavia'] } - $nova_flavor_defaults = merge($octavia_flavor_defaults, $nova_flavor_config) + $nova_flavor_defaults = stdlib::merge($octavia_flavor_defaults, $nova_flavor_config) create_resources('nova_flavor', $octavia_flavor, $nova_flavor_defaults) if $manage_service { Nova_flavor<| tag == 'octavia' |> ~> Service['octavia-worker'] diff --git a/metadata.json b/metadata.json index 8d441623..6a804a83 100644 --- a/metadata.json +++ b/metadata.json @@ -7,7 +7,7 @@ }, { "name": "puppetlabs/stdlib", - "version_requirement": ">=5.0.0 <10.0.0" + "version_requirement": ">=9.0.0 <10.0.0" }, { "name": "openstack/keystone",