openstack/puppet-tempest
Code Issues Proposed changes

Remove deprecated ensure_package option

Browse Source 
Change-Id: If3da47c332b2f1d79951a78b432ae0ab6e919ad9
This commit is contained in:
ZhongShengping 2018-03-29 12:01:15 +08:00
parent 2e998fddf4
commit 77c810d6b5
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@ -219,9 +219,6 @@
# Defaults to undef # Defaults to undef
# [*allow_tenant_isolation*] # [*allow_tenant_isolation*]
# Defaults to undef # Defaults to undef
# [*ensure_package*]
# (optional) The state of tempest packages
# Defaults to undef
# #
class tempest( class tempest(
$package_ensure = 'present', $package_ensure = 'present',
@ -358,7 +355,6 @@ class tempest(
$alt_tenant_name = undef, $alt_tenant_name = undef,
$admin_tenant_name = undef, $admin_tenant_name = undef,
$allow_tenant_isolation = undef, $allow_tenant_isolation = undef,
$ensure_package = 'present',
) { ) {
if !is_service_default($tempest_roles) and !empty($tempest_roles){ if !is_service_default($tempest_roles) and !empty($tempest_roles){
@ -400,14 +396,6 @@ class tempest(
$use_dynamic_credentials_real = $use_dynamic_credentials $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 ::tempest::params
include ::openstacklib::openstackclient include ::openstacklib::openstackclient
@ -476,7 +464,7 @@ the future release. Please use tempest::package_ensure instead.")
if ! $install_from_source { if ! $install_from_source {
package { 'tempest': package { 'tempest':
ensure => $package_ensure_real, ensure => $package_ensure,
name => $::tempest::params::package_name, name => $::tempest::params::package_name,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }

3
releasenotes/notes/remove_deprecated_ensure_package_option-a22d645117cc993c.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated ensure_package option has been removed.