openstack/puppet-barbican
Code Issues Proposed changes

Remove usage of custom os_package_type fact

Browse Source 
Currently we support usage of distro packages only, and this custom
fact can be simply replaced by the default fact.

Change-Id: Ib8f47ce0bbe34970f9324289210fdb74da6f2098
This commit is contained in:
Takashi Kajinami 2022-01-05 21:51:21 +09:00
parent da645f8270
commit 685301e737
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@ -471,7 +471,7 @@ class barbican::api (
if $service_name == 'barbican-api' or $service_name == $::barbican::params::api_service_name {
if $::os_package_type == 'ubuntu' {
if $::operatingsystem == 'Ubuntu' {
fail('With Ubuntu packages the service_name must be set to httpd as there is no eventlet init script.')
}
@ -490,7 +490,7 @@ deprecated and will be removed in a future release. Use openstack-barbican-api i
}
# Debian is using UWSGI, not gunicorn
if $::os_package_type != 'debian' {
if $::operatingsystem != 'Debian' {
file_line { 'Modify bind_port in gunicorn-config.py':
path => '/etc/barbican/gunicorn-config.py',
line => "bind = '${bind_host}:${bind_port}'",
@ -501,7 +501,7 @@ deprecated and will be removed in a future release. Use openstack-barbican-api i
} elsif $service_name == 'httpd' {
# Ubuntu packages does not have a barbican-api service
if $::os_package_type != 'ubuntu' {
if $::operatingsystem != 'Ubuntu' {
service { 'barbican-api':
ensure => 'stopped',
name => $::barbican::params::api_service_name,

2
manifests/wsgi/uwsgi.pp
View File

@ -29,7 +29,7 @@ class barbican::wsgi::uwsgi (
include barbican::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.')
}