openstack
/
puppet-aodh
Code Issues Proposed changes

Merge "Drop unused implementation to expect "undef""

This commit is contained in:
Zuul 2022-02-20 11:53:01 +00:00 committed by Gerrit Code Review
parent e472146062 2865eb0be1
commit 0f0fcf4661
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/wsgi/apache.pp
View File

@ -147,19 +147,6 @@ class aodh::wsgi::apache (
include aodh::deps
# TODO(tkajinam): Remove the following compat codes in W-cycle.
if $wsgi_script_dir == undef {
warning('Usage of undef for the wsgi_script_dir paramaeter has been deprecated. \
Use $::aodh::params::aodh_wsgi_script_dir instead')
}
$wsgi_script_dir_real = pick($wsgi_script_dir, $::aodh::params::aodh_wsgi_script_dir)
if $wsgi_script_source == undef {
warning('Usage of undef for the wsgi_script_source paramaeter has been deprecated. \
Use $::aodh::params::aodh_wsgi_script_source instead')
}
$wsgi_script_source_real = pick($wsgi_script_source, $::aodh::params::aodh_wsgi_script_source)
# NOTE(aschultz): needed because the packaging may introduce some apache
# configuration files that apache may remove. See LP#1657847
Anchor['aodh::install::end'] -> Class['apache']
@ -186,9 +173,9 @@ Use $::aodh::params::aodh_wsgi_script_source instead')
wsgi_daemon_process => 'aodh',
wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'aodh',
wsgi_script_dir => $wsgi_script_dir_real,
wsgi_script_dir => $wsgi_script_dir,
wsgi_script_file => 'app',
wsgi_script_source => $wsgi_script_source_real,
wsgi_script_source => $wsgi_script_source,
custom_wsgi_process_options => $custom_wsgi_process_options,
access_log_file => $access_log_file,
access_log_format => $access_log_format,

10
releasenotes/notes/wsgi-script-use-param-a9408ab5d05478e3.yaml
View File

@ -1,10 +0,0 @@
---
deprecations:
- |
Usage of ``undef`` for the following parameters has been deprecated and it
won't be replaced by the default value automatically in a future release.
Set the exact value or use the parameters defined in the ``aodh::param``
class.
- ``wsgi::apache::aodh_wsgi_script_path``
- ``wsgi::apache::aodh_wsgi_script_source``