From cf976fc5dd71f8218335542097c6565728a6cf25 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 23 Jan 2023 10:21:35 +0900
Subject: [PATCH] apache: Remove deprecated api_port parameter

The parameter was deprecated in favor of the port parameter during
the previous cycle.

Change-Id: If9c672972d30ce46251c8d3353de6ff818bbc486
---
 manifests/wsgi/apache.pp                           | 14 +-------------
 ...sgi-apache-params-cleanup-7964696507e6e32a.yaml |  5 +++++
 2 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/wsgi-apache-params-cleanup-7964696507e6e32a.yaml

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 2ce9dea..752d30e 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -119,12 +119,6 @@
 #   directives to be placed at the end of the vhost configuration.
 #   Defaults to undef.
 #
-# DEPRECATED PARAMETERS
-#
-# [*api_port*]
-#   (Optional) The port for Placement API service.
-#   Defaults to undef
-#
 # == Dependencies
 #
 #   requires Class['apache'] & Class['placement']
@@ -163,8 +157,6 @@ class placement::wsgi::apache (
   $headers                     = undef,
   $request_headers             = undef,
   $vhost_custom_fragment       = undef,
-  # DEPRECATED PARAMETERS
-  $api_port                    = undef,
 ) {
 
   include placement::deps
@@ -172,13 +164,9 @@ class placement::wsgi::apache (
 
   Anchor['placement::install::end'] -> Class['apache']
 
-  if $api_port {
-    warning('The api_port parameter is deprecated. Use the port parameter')
-  }
-
   ::openstacklib::wsgi::apache { 'placement_wsgi':
     bind_host                   => $bind_host,
-    bind_port                   => pick($api_port, $port),
+    bind_port                   => $port,
     group                       => 'placement',
     path                        => $path,
     priority                    => $priority,
diff --git a/releasenotes/notes/wsgi-apache-params-cleanup-7964696507e6e32a.yaml b/releasenotes/notes/wsgi-apache-params-cleanup-7964696507e6e32a.yaml
new file mode 100644
index 0000000..cd329b3
--- /dev/null
+++ b/releasenotes/notes/wsgi-apache-params-cleanup-7964696507e6e32a.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``placement::wsgi::apache::api_port`` parameter has been removed. Use
+    the ``port`` parameter instead.