From e3b7c250a82b022765641c30c861b281d428d7c4 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: I4f4e1993795625a24785ce548cd06f2447e13349
---
 manifests/db.pp                                | 18 +-----------------
 manifests/init.pp                              | 18 +-----------------
 ...ensure_package_option-b6afaafe8e6bf9fd.yaml |  3 +++
 3 files changed, 5 insertions(+), 34 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_ensure_package_option-b6afaafe8e6bf9fd.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 48e3624b..db332b02 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -12,29 +12,13 @@
 #   (optional) The state of gnocchi packages
 #   Defaults to 'present'
 #
-# DEPRECATED PARAMETERS
-#
-# [*ensure_package*]
-#   (optional) The state of gnocchi packages
-#   Defaults to undef
-#
 class gnocchi::db (
   $database_connection = 'sqlite:////var/lib/gnocchi/gnocchi.sqlite',
   $package_ensure      = 'present',
-  # DEPRECATED PARAMETERS
-  $ensure_package      = undef,
 ) inherits gnocchi::params {
 
   include ::gnocchi::deps
 
-  if $ensure_package {
-    warning("gnocchi::db::ensure_package is deprecated and will be removed in \
-the future release. Please use gnocchi::db::package_ensure instead.")
-    $package_ensure_real = $ensure_package
-  } else {
-    $package_ensure_real = $package_ensure
-  }
-
   # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
   # to use gnocchi::<myparam> if gnocchi::db::<myparam> isn't specified.
   $database_connection_real = pick($::gnocchi::database_connection, $database_connection)
@@ -80,7 +64,7 @@ the future release. Please use gnocchi::db::package_ensure instead.")
     # NOTE(tobasco): gnocchi-indexer-sqlalchemy not packaged in Ubuntu for Queens release.
     if $::osfamily != 'Debian' {
       package { 'gnocchi-indexer-sqlalchemy':
-        ensure => $package_ensure_real,
+        ensure => $package_ensure,
         name   => $::gnocchi::params::indexer_package_name,
         tag    => ['openstack', 'gnocchi-package'],
       }
diff --git a/manifests/init.pp b/manifests/init.pp
index 1f538279..35eadb85 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -39,12 +39,6 @@
 #   in the gnocchi config.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-#
-# [*ensure_package*]
-#   (optional) The state of gnocchi packages
-#   Defaults to undef
-#
 class gnocchi (
   $package_ensure      = 'present',
   $debug               = undef,
@@ -54,24 +48,14 @@ class gnocchi (
   $log_facility        = undef,
   $database_connection = undef,
   $purge_config        = false,
-  # DEPRECATED PARAMETERS
-  $ensure_package      = undef,
 ) inherits gnocchi::params {
 
   include ::gnocchi::deps
   include ::gnocchi::db
   include ::gnocchi::logging
 
-  if $ensure_package {
-    warning("gnocchi::ensure_package is deprecated and will be removed in \
-the future release. Please use gnocchi::package_ensure instead.")
-    $package_ensure_real = $ensure_package
-  } else {
-    $package_ensure_real = $package_ensure
-  }
-
   package { 'gnocchi':
-    ensure => $package_ensure_real,
+    ensure => $package_ensure,
     name   => $::gnocchi::params::common_package_name,
     tag    => ['openstack', 'gnocchi-package'],
   }
diff --git a/releasenotes/notes/remove_deprecated_ensure_package_option-b6afaafe8e6bf9fd.yaml b/releasenotes/notes/remove_deprecated_ensure_package_option-b6afaafe8e6bf9fd.yaml
new file mode 100644
index 00000000..67253070
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_ensure_package_option-b6afaafe8e6bf9fd.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated ensure_package option has been removed.