From 7023c98764a6935a24c2c74d2df1fc463986dcd9 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: I5be8fdc2705988a0fdcc5d3801b67078e7acb2c3
---
 manifests/init.pp                                 | 15 +--------------
 ...ed_ensure_package_option-825213ae8953e207.yaml |  3 +++
 2 files changed, 4 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_ensure_package_option-825213ae8953e207.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 992f25a0..0d5584f4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -259,10 +259,6 @@
 #   (optional) The RabbitMQ virtual host.
 #   Defaults to $::os_service_default
 #
-# [*ensure_package*]
-#   (optional) The state of aodh packages
-#   Defaults to undef
-#
 # [*rpc_backend*]
 #   (optional) The rpc backend implementation to use, can be:
 #     amqp (for AMQP 1.0 protocol)
@@ -329,7 +325,6 @@ class aodh (
   $rabbit_port                        = $::os_service_default,
   $rabbit_userid                      = $::os_service_default,
   $rabbit_virtual_host                = $::os_service_default,
-  $ensure_package                     = undef,
   $rpc_backend                        = undef,
 ) inherits aodh::params {
 
@@ -350,16 +345,8 @@ aodh::rpc_backend are deprecated. Please use aodh::default_transport_url \
 instead.")
   }
 
-  if $ensure_package {
-    warning("aodh::ensure_package is deprecated and will be removed in \
-the future release. Please use aodh::package_ensure instead.")
-    $package_ensure_real = $ensure_package
-  } else {
-    $package_ensure_real = $package_ensure
-  }
-
   package { 'aodh':
-    ensure => $package_ensure_real,
+    ensure => $package_ensure,
     name   => $::aodh::params::common_package_name,
     tag    => ['openstack', 'aodh-package'],
   }
diff --git a/releasenotes/notes/remove_deprecated_ensure_package_option-825213ae8953e207.yaml b/releasenotes/notes/remove_deprecated_ensure_package_option-825213ae8953e207.yaml
new file mode 100644
index 00000000..67253070
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_ensure_package_option-825213ae8953e207.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated ensure_package option has been removed.