Remove deprecated keystone::wsgi::wsgi_script_ensure

This parameter was deprecated before and will now
be removed since it has no effect.

Change-Id: I867705acd525d6a2b24d93580bbe8dbcc12df472
This commit is contained in:
Tobias Urdin 2018-11-21 11:46:12 +01:00
parent 59ffbb9204
commit ebd139c653
3 changed files with 4 additions and 14 deletions

View File

@ -172,12 +172,6 @@
# (Optional) apache::vhost wsgi_chunked_request parameter.
# Defaults to undef
#
# DEPRECATED PARAMETERS
#
# [*wsgi_script_ensure*]
# (Optional) File ensure parameter for wsgi scripts.
# Defaults to undef
#
class keystone::wsgi::apache (
$servername = $::fqdn,
$servername_admin = undef,
@ -216,8 +210,6 @@ class keystone::wsgi::apache (
$vhost_custom_fragment = undef,
$custom_wsgi_process_options_main = {},
$custom_wsgi_process_options_admin = {},
## DEPRECATED PARAMETERS
$wsgi_script_ensure = undef,
) inherits ::keystone::params {
include ::keystone::deps
@ -270,11 +262,6 @@ class keystone::wsgi::apache (
require => Anchor['keystone::install::end'],
}
# TODO(tobasco): Delete this when wsgi_script_ensure is removed.
if $wsgi_script_ensure {
warning('wsgi_script_ensure has NO effect and is deprecated for removal')
}
if $public_port == $admin_port {
$custom_wsgi_script_aliases = { $admin_path_real => "${::keystone::params::keystone_wsgi_script_path}/keystone-admin" }

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated parameter keystone::wsgi::wsgi_script_ensure is now deleted.

View File

@ -342,7 +342,6 @@ describe 'keystone::wsgi::apache' do
describe 'when overriding parameters using symlink and custom file source' do
let :params do
{
:wsgi_script_ensure => 'link',
:wsgi_script_source => '/opt/keystone/httpd/keystone.py',
}
end