Merge "apache: Remove deprecated api_port parameter"
This commit is contained in:
commit
16503a022e
|
@ -119,12 +119,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
|
|
||||||
#
|
|
||||||
# [*api_port*]
|
|
||||||
# (Optional) The port for Placement API service.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# == Dependencies
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['placement']
|
# requires Class['apache'] & Class['placement']
|
||||||
|
@ -163,8 +157,6 @@ class placement::wsgi::apache (
|
||||||
$headers = undef,
|
$headers = undef,
|
||||||
$request_headers = undef,
|
$request_headers = undef,
|
||||||
$vhost_custom_fragment = undef,
|
$vhost_custom_fragment = undef,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$api_port = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include placement::deps
|
include placement::deps
|
||||||
|
@ -172,13 +164,9 @@ class placement::wsgi::apache (
|
||||||
|
|
||||||
Anchor['placement::install::end'] -> Class['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':
|
::openstacklib::wsgi::apache { 'placement_wsgi':
|
||||||
bind_host => $bind_host,
|
bind_host => $bind_host,
|
||||||
bind_port => pick($api_port, $port),
|
bind_port => $port,
|
||||||
group => 'placement',
|
group => 'placement',
|
||||||
path => $path,
|
path => $path,
|
||||||
priority => $priority,
|
priority => $priority,
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``placement::wsgi::apache::api_port`` parameter has been removed. Use
|
||||||
|
the ``port`` parameter instead.
|
Loading…
Reference in New Issue