Inconsistent package_ensure parameter name
The parameter name used to enforce package state is inconsistent across manifests and modules. I settle on package_ensure since it's already widely used. Change-Id: I1338c2eef3eae705b90f2fbaa97d0734c1a2bc05 Closes-Bug: #1668732
This commit is contained in:
parent
1f0a5e0040
commit
1701be4573
@ -5,7 +5,7 @@
|
||||
# Note that only parameters for which values are provided will be
|
||||
# managed in tempest.conf.
|
||||
#
|
||||
# [*ensure_package*]
|
||||
# [*package_ensure*]
|
||||
# (optional) The state of tempest packages
|
||||
# Defaults to 'present'
|
||||
# [*tempest_workspace*]
|
||||
@ -205,9 +205,12 @@
|
||||
# Defaults to undef
|
||||
# [*allow_tenant_isolation*]
|
||||
# Defaults to undef
|
||||
# [*ensure_package*]
|
||||
# (optional) The state of tempest packages
|
||||
# Defaults to undef
|
||||
#
|
||||
class tempest(
|
||||
$ensure_package = 'present',
|
||||
$package_ensure = 'present',
|
||||
$tempest_workspace = '/var/lib/tempest',
|
||||
$install_from_source = true,
|
||||
$git_clone = true,
|
||||
@ -334,6 +337,7 @@ class tempest(
|
||||
$alt_tenant_name = undef,
|
||||
$admin_tenant_name = undef,
|
||||
$allow_tenant_isolation = undef,
|
||||
$ensure_package = 'present',
|
||||
) {
|
||||
|
||||
if !is_service_default($tempest_roles) and !empty($tempest_roles){
|
||||
@ -375,6 +379,14 @@ class tempest(
|
||||
$use_dynamic_credentials_real = $use_dynamic_credentials
|
||||
}
|
||||
|
||||
if $ensure_package {
|
||||
warning("tempest::ensure_package is deprecated and will be removed in \
|
||||
the future release. Please use tempest::package_ensure instead.")
|
||||
$package_ensure_real = $ensure_package
|
||||
} else {
|
||||
$package_ensure_real = $package_ensure
|
||||
}
|
||||
|
||||
include ::tempest::params
|
||||
|
||||
include ::openstacklib::openstackclient
|
||||
@ -443,7 +455,7 @@ class tempest(
|
||||
|
||||
if ! $install_from_source {
|
||||
package { 'tempest':
|
||||
ensure => $ensure_package,
|
||||
ensure => $package_ensure_real,
|
||||
name => $::tempest::params::package_name,
|
||||
tag => ['openstack', 'tempest-package'],
|
||||
}
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
deprecations:
|
||||
- tempest::ensure_package is now deprecated and will be removed in the
|
||||
future release. Please use tempest::package_ensure instead.
|
Loading…
Reference in New Issue
Block a user