From 5b17af21a7ae06c658f2399a5907bd613cea0e6d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 23 Jan 2023 10:16:58 +0900
Subject: [PATCH] apache: Clean up deprecated public_* parameters

These were deprecated during the previous cycle so can be removed now.

Change-Id: I4e2e29d98803015b50c0f11678645cd5166e7d3c
---
 manifests/wsgi/apache.pp                      | 24 ++-----------------
 ...remove-public-params-76ec95f5d35737e6.yaml |  8 +++++++
 2 files changed, 10 insertions(+), 22 deletions(-)
 create mode 100644 releasenotes/notes/wsgi-apache-remove-public-params-76ec95f5d35737e6.yaml

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 8fd9fc56..f24c9835 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -106,16 +106,6 @@
 #   directives to be placed at the end of the vhost configuration.
 #   Defaults to undef.
 #
-# DEPRECATED PARAMETERS
-#
-# [*public_port*]
-#   (Optional) The public port.
-#   Defaults to undef
-#
-# [*public_path*]
-#   (Optional) The prefix for the public endpoint.
-#   Defaults to undef
-#
 # == Authors
 #
 #   Ade Lee <alee@redhat.com>
@@ -152,9 +142,6 @@ class barbican::wsgi::apache (
   $headers                     = undef,
   $request_headers             = undef,
   $vhost_custom_fragment       = undef,
-  # DEPRECATED PARAMETERS
-  $public_port                 = undef,
-  $public_path                 = undef
 ) {
 
   include barbican::deps
@@ -162,18 +149,11 @@ class barbican::wsgi::apache (
 
   Anchor['barbican::install::end'] -> Class['apache']
 
-  if $public_port {
-    warning('The public_port parameter is deprecated. Use the port parameter')
-  }
-  if $public_path {
-    warning('The public_path parameter is deprecated. Use the path parameter')
-  }
-
   openstacklib::wsgi::apache { 'barbican_wsgi':
     bind_host                   => $bind_host,
-    bind_port                   => pick($public_port, $port),
+    bind_port                   => $port,
     group                       => $::barbican::params::group,
-    path                        => pick($public_path, $path),
+    path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
     ssl                         => $ssl,
diff --git a/releasenotes/notes/wsgi-apache-remove-public-params-76ec95f5d35737e6.yaml b/releasenotes/notes/wsgi-apache-remove-public-params-76ec95f5d35737e6.yaml
new file mode 100644
index 00000000..b90d6160
--- /dev/null
+++ b/releasenotes/notes/wsgi-apache-remove-public-params-76ec95f5d35737e6.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The follwoing parameters of the ``barbican::wsgi::apache`` class have been
+    removed.
+
+    - ``public_port``
+    - ``public_path``