From 0e2e25e667da40bf46d749525cfd4493626a9d9a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 4 Sep 2022 17:18:01 +0900
Subject: [PATCH] s3: Remove the unused/deprecated ensure parameter

This parameter has been unused and was deprecated formally during
Wallaby cycle[1].

[1] 42d74471dd1f6f4104a3be0218f007566342bedd

Change-Id: I2f3631fb45587ee74a3b3dabc3c281a2b9a242ae
---
 manifests/proxy/s3api.pp                             | 12 ------------
 .../notes/remove-s3api-ensure-f277f4f7933f7fa8.yaml  |  4 ++++
 2 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove-s3api-ensure-f277f4f7933f7fa8.yaml

diff --git a/manifests/proxy/s3api.pp b/manifests/proxy/s3api.pp
index 715b92b7..47ff3db2 100644
--- a/manifests/proxy/s3api.pp
+++ b/manifests/proxy/s3api.pp
@@ -72,12 +72,6 @@
 #   Override the default log routing for s3api middleware
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*ensure*]
-#   Enable or not s3api middleware
-#   Defaults to undef
-#
 class swift::proxy::s3api(
   $allow_no_owner                = $::os_service_default,
   $location                      = $::os_service_default,
@@ -95,16 +89,10 @@ class swift::proxy::s3api(
   $force_swift_request_proxy_log = $::os_service_default,
   $min_segment_size              = $::os_service_default,
   $log_name                      = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $ensure                        = undef,
 ) {
 
   include swift::deps
 
-  if $ensure != undef {
-    warning('The ensure parameter has been deprecated and has no effect')
-  }
-
   swift_proxy_config {
     'filter:s3api/use':                           value => 'egg:swift#s3api';
     'filter:s3api/allow_no_owner':                value => $allow_no_owner;
diff --git a/releasenotes/notes/remove-s3api-ensure-f277f4f7933f7fa8.yaml b/releasenotes/notes/remove-s3api-ensure-f277f4f7933f7fa8.yaml
new file mode 100644
index 00000000..551c581b
--- /dev/null
+++ b/releasenotes/notes/remove-s3api-ensure-f277f4f7933f7fa8.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``swift::proxy::s3api::ensure`` parameter has been removed.