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

Change-Id: Ia368b6d359d20fe84e438bda23e558a5b71ed918
---
 manifests/api.pp                                  | 15 +--------------
 ...ed_ensure_package_option-93527d0ab3e932f0.yaml |  3 +++
 2 files changed, 4 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_ensure_package_option-93527d0ab3e932f0.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index ae0d6cfb..deddb1fb 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -263,10 +263,6 @@
 #   (optional) The RabbitMQ virtual host.
 #   Defaults to $::os_service_default
 #
-# [*ensure_package*]
-#   (optional) The state of barbican packages
-#   Defaults to undef
-#
 # [*rpc_backend*]
 #   (optional) The rpc backend implementation to use, can be:
 #     rabbit (for rabbitmq)
@@ -330,7 +326,6 @@ class barbican::api (
   $rabbit_port                                   = $::os_service_default,
   $rabbit_userid                                 = $::os_service_default,
   $rabbit_virtual_host                           = $::os_service_default,
-  $ensure_package                                = undef,
   $rpc_backend                                   = $::os_service_default,
 ) inherits barbican::params {
 
@@ -353,14 +348,6 @@ barbican::api::rabbit_port, barbican::api::rabbit_userid, barbican::api::rabbit_
 barbican::rpc_backend are deprecated. Please use barbican::api::default_transport_url instead.")
   }
 
-  if $ensure_package {
-    warning("barbican::api::ensure_package is deprecated and will be removed in \
-the future release. Please use barbican::api::package_ensure instead.")
-    $package_ensure_real = $ensure_package
-  } else {
-    $package_ensure_real = $package_ensure
-  }
-
   # TODO: Remove the posix users and permissions and merge this definition
   # with the previous one, once the barbican package has been updated
   # with the correct ownership for this directory.
@@ -374,7 +361,7 @@ the future release. Please use barbican::api::package_ensure instead.")
   }
 
   package { 'barbican-api':
-    ensure => $package_ensure_real,
+    ensure => $package_ensure,
     name   => $::barbican::params::api_package_name,
     tag    => ['openstack', 'barbican-package'],
   }
diff --git a/releasenotes/notes/remove_deprecated_ensure_package_option-93527d0ab3e932f0.yaml b/releasenotes/notes/remove_deprecated_ensure_package_option-93527d0ab3e932f0.yaml
new file mode 100644
index 00000000..67253070
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_ensure_package_option-93527d0ab3e932f0.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated ensure_package option has been removed.