From 77c810d6b5994b2d01a36eed34563b61f7031d44 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 29 Mar 2018 12:01:15 +0800
Subject: [PATCH] Remove deprecated ensure_package option

Change-Id: If3da47c332b2f1d79951a78b432ae0ab6e919ad9
---
 manifests/init.pp                                  | 14 +-------------
 ...ted_ensure_package_option-a22d645117cc993c.yaml |  3 +++
 2 files changed, 4 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_ensure_package_option-a22d645117cc993c.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index a8ce8d23..7b592b4a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -219,9 +219,6 @@
 #   Defaults to undef
 #  [*allow_tenant_isolation*]
 #   Defaults to undef
-#  [*ensure_package*]
-#  (optional) The state of tempest packages
-#   Defaults to undef
 #
 class tempest(
   $package_ensure                   = 'present',
@@ -358,7 +355,6 @@ 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){
@@ -400,14 +396,6 @@ 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
@@ -476,7 +464,7 @@ the future release. Please use tempest::package_ensure instead.")
 
   if ! $install_from_source {
     package { 'tempest':
-      ensure => $package_ensure_real,
+      ensure => $package_ensure,
       name   => $::tempest::params::package_name,
       tag    => ['openstack', 'tempest-package'],
     }
diff --git a/releasenotes/notes/remove_deprecated_ensure_package_option-a22d645117cc993c.yaml b/releasenotes/notes/remove_deprecated_ensure_package_option-a22d645117cc993c.yaml
new file mode 100644
index 00000000..67253070
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_ensure_package_option-a22d645117cc993c.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated ensure_package option has been removed.