Switch to namespace sdtlib functions
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: I63f4f02b6a349d600013791e400c6ac01960f2ae Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -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'],
|
||||
|
||||
@@ -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']
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user