Merge "Fix inconsistent parameter name in aodh::params"
This commit is contained in:
commit
a2550e7f37
@ -21,7 +21,7 @@ class aodh::params {
|
||||
$expirer_service_name = 'openstack-aodh-expirer'
|
||||
$listener_package_name = 'openstack-aodh-listener'
|
||||
$listener_service_name = 'openstack-aodh-listener'
|
||||
$aodh_wsgi_script_path = '/var/www/cgi-bin/aodh'
|
||||
$aodh_wsgi_script_dir = '/var/www/cgi-bin/aodh'
|
||||
$aodh_wsgi_script_source = '/usr/bin/aodh-api'
|
||||
$redis_package_name = "python${pyvers}-redis"
|
||||
}
|
||||
@ -37,7 +37,7 @@ class aodh::params {
|
||||
$expirer_service_name = 'aodh-expirer'
|
||||
$listener_package_name = 'aodh-listener'
|
||||
$listener_service_name = 'aodh-listener'
|
||||
$aodh_wsgi_script_path = '/usr/lib/cgi-bin/aodh'
|
||||
$aodh_wsgi_script_dir = '/usr/lib/cgi-bin/aodh'
|
||||
$aodh_wsgi_script_source = '/usr/share/aodh/app.wsgi'
|
||||
$redis_package_name = "python${pyvers}-redis"
|
||||
}
|
||||
|
@ -135,7 +135,7 @@ class aodh::wsgi::apache (
|
||||
$access_log_format = false,
|
||||
$error_log_file = undef,
|
||||
$custom_wsgi_process_options = {},
|
||||
$wsgi_script_dir = $::aodh::params::aodh_wsgi_script_path,
|
||||
$wsgi_script_dir = $::aodh::params::aodh_wsgi_script_dir,
|
||||
$wsgi_script_source = $::aodh::params::aodh_wsgi_script_source,
|
||||
$vhost_custom_fragment = undef,
|
||||
) inherits aodh::params {
|
||||
@ -150,9 +150,9 @@ class aodh::wsgi::apache (
|
||||
# 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_path instead')
|
||||
Use $::aodh::params::aodh_wsgi_script_dir instead')
|
||||
}
|
||||
$wsgi_script_dir_real = pick($wsgi_script_dir, $::aodh::params::aodh_wsgi_script_path)
|
||||
$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. \
|
||||
|
Loading…
Reference in New Issue
Block a user