apache: Clean up deprecated public_* parameters

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

Change-Id: I4e2e29d98803015b50c0f11678645cd5166e7d3c
This commit is contained in:
Takashi Kajinami 2023-01-23 10:16:58 +09:00
parent fb2bca25fa
commit 5b17af21a7
2 changed files with 10 additions and 22 deletions

View File

@ -106,16 +106,6 @@
# directives to be placed at the end of the vhost configuration. # directives to be placed at the end of the vhost configuration.
# Defaults to undef. # 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 # == Authors
# #
# Ade Lee <alee@redhat.com> # Ade Lee <alee@redhat.com>
@ -152,9 +142,6 @@ class barbican::wsgi::apache (
$headers = undef, $headers = undef,
$request_headers = undef, $request_headers = undef,
$vhost_custom_fragment = undef, $vhost_custom_fragment = undef,
# DEPRECATED PARAMETERS
$public_port = undef,
$public_path = undef
) { ) {
include barbican::deps include barbican::deps
@ -162,18 +149,11 @@ class barbican::wsgi::apache (
Anchor['barbican::install::end'] -> Class['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': openstacklib::wsgi::apache { 'barbican_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => pick($public_port, $port), bind_port => $port,
group => $::barbican::params::group, group => $::barbican::params::group,
path => pick($public_path, $path), path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
ssl => $ssl, ssl => $ssl,

View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The follwoing parameters of the ``barbican::wsgi::apache`` class have been
removed.
- ``public_port``
- ``public_path``