openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "Remove usage of custom os_package_type fact"

This commit is contained in:
Zuul 2022-01-08 07:12:23 +00:00 committed by Gerrit Code Review
parent 92f9de20f7 c32b1e1e74
commit cf5786ec7b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -695,7 +695,7 @@ removed in a future realse. Use keystone::db::database_max_overflow instead')
# Note: Debian uses uwsgi if using keystone service, which isn't deprecated
# and therefore, no warning should be displayed.
if $service_name == $::keystone::params::service_name and $::os_package_type != 'debian'{
if $service_name == $::keystone::params::service_name and $::operatingsystem != 'Debian'{
warning("Keystone under Eventlet has been deprecated during the Kilo cycle. \
Support for deploying under eventlet will be dropped as of the M-release of OpenStack.")
}

2
manifests/wsgi/uwsgi.pp
View File

@ -29,7 +29,7 @@ class keystone::wsgi::uwsgi (
include keystone::deps
if $::os_package_type != 'debian'{
if $::operatingsystem != 'Debian'{
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
}