apache: Remove deprecated api_port parameter

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

Change-Id: Ib8073213164e0af0a901771a484e066f093608dd
This commit is contained in:
Takashi Kajinami 2023-01-23 10:19:34 +09:00
parent b5b45aad37
commit 38982763a8
2 changed files with 6 additions and 13 deletions

View File

@ -141,12 +141,6 @@
# (Optional) apache::vhost wsgi_chunked_request parameter. # (Optional) apache::vhost wsgi_chunked_request parameter.
# Defaults to undef # Defaults to undef
# #
# DEPRECATED PARAMETERS
#
# [*api_port*]
# (Optional) The keystone API port.
# Defaults to 5000
#
class keystone::wsgi::apache ( class keystone::wsgi::apache (
$servername = $::fqdn, $servername = $::fqdn,
$bind_host = undef, $bind_host = undef,
@ -179,8 +173,6 @@ class keystone::wsgi::apache (
$request_headers = undef, $request_headers = undef,
$vhost_custom_fragment = undef, $vhost_custom_fragment = undef,
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
# DEPRECATED PARAMETERS
$api_port = undef,
) { ) {
include keystone::deps include keystone::deps
@ -188,14 +180,10 @@ class keystone::wsgi::apache (
Anchor['keystone::install::end'] -> Class['apache'] Anchor['keystone::install::end'] -> Class['apache']
if $api_port {
warning('The api_port parameter is deprecated. Use the port parameter')
}
::openstacklib::wsgi::apache { 'keystone_wsgi': ::openstacklib::wsgi::apache { 'keystone_wsgi':
servername => $servername, servername => $servername,
bind_host => $bind_host, bind_host => $bind_host,
bind_port => pick($api_port, $port), bind_port => $port,
group => $::keystone::params::group, group => $::keystone::params::group,
path => $path, path => $path,
workers => $workers, workers => $workers,

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``keystone::wsgi::apache::api_port`` parameter has been removed. Use
the ``port`` parameter instead.