openstack/puppet-openstack-integration
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: I8cad680e0ec96388cf5fa0e34f50b2c4d5969523
This commit is contained in:
Takashi Kajinami 2022-01-05 22:44:55 +09:00
parent f7a50c8d76
commit 1668df9ec4
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/ceph.pp
View File

@ -25,7 +25,7 @@ class openstack_integration::ceph (
# FIXME(ykarel) python2-rbd is installed as a indirect dependency for 'ceph' package, # FIXME(ykarel) python2-rbd is installed as a indirect dependency for 'ceph' package,
# but we need to install python3-rbd in Fedora until 'ceph' package is fixed. # but we need to install python3-rbd in Fedora until 'ceph' package is fixed.
if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') or if ($::operatingsystem == 'Debian') or ($::operatingsystem == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
ensure_resource('package', 'python3-rbd', { ensure_resource('package', 'python3-rbd', {

2
manifests/placement.pp
View File

@ -43,7 +43,7 @@ class openstack_integration::placement {
include placement::db::sync include placement::db::sync
include placement::api include placement::api
include apache include apache
if ($::os_package_type != 'debian') { if ($::operatingsystem != 'Debian') {
class { 'placement::wsgi::apache': class { 'placement::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::ip_for_url,
ssl_key => "/etc/placement/ssl/private/${::fqdn}.pem", ssl_key => "/etc/placement/ssl/private/${::fqdn}.pem",

2
manifests/redis.pp
View File

@ -26,7 +26,7 @@ class openstack_integration::redis {
# due to issues in OpenStack CI with the redis package, we need to disable # due to issues in OpenStack CI with the redis package, we need to disable
# the service enable flag. The service still starts but the management of # the service enable flag. The service still starts but the management of
# the service with systemd errors. # the service with systemd errors.
if ($::os_package_type == 'debian') { if ($::operatingsystem == 'Debian') {
$service_enable = false $service_enable = false
} else { } else {
$service_enable = true $service_enable = true

8
manifests/repos.pp
View File

@ -8,8 +8,8 @@ class openstack_integration::repos {
} }
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
case $::os_package_type { case $::operatingsystem {
'ubuntu': { 'Ubuntu': {
include apt include apt
class { 'openstack_extras::repo::debian::ubuntu': class { 'openstack_extras::repo::debian::ubuntu':
release => 'wallaby', release => 'wallaby',
@ -17,7 +17,7 @@ class openstack_integration::repos {
uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'), uca_location => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
} }
} }
'debian': { 'Debian': {
include apt include apt
class { 'openstack_extras::repo::debian::debian': class { 'openstack_extras::repo::debian::debian':
release => 'ussuri', release => 'ussuri',
@ -25,7 +25,7 @@ class openstack_integration::repos {
} }
} }
default: { default: {
fail("Unsupported package type (${::os_package_type})") fail("Unsupported package type (${::operatingsystem})")
} }
} }
# Ceph is both packaged on UCA and official download.ceph.com packages # Ceph is both packaged on UCA and official download.ceph.com packages

4
manifests/sahara.pp
View File

@ -64,8 +64,8 @@ class openstack_integration::sahara (
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
} }
$service_name = $::os_package_type ? { $service_name = $::operatingsystem ? {
'debian' => $::sahara::params::api_service_name, 'Debian' => $::sahara::params::api_service_name,
default => 'httpd', default => 'httpd',
} }
class { 'sahara::service::api': class { 'sahara::service::api':

4
manifests/swift.pp
View File

@ -13,7 +13,7 @@ class openstack_integration::swift {
require => Package['rsyslog'], require => Package['rsyslog'],
} }
if ($::os_package_type == 'debian') { if ($::operatingsystem == 'Debian') {
file { '/var/log/swift': file { '/var/log/swift':
ensure => directory, ensure => directory,
mode => '0750', mode => '0750',
@ -33,7 +33,7 @@ class openstack_integration::swift {
# Ubuntu/Debian requires particular permissions for rsyslog to work # Ubuntu/Debian requires particular permissions for rsyslog to work
if $::osfamily == 'Debian' { if $::osfamily == 'Debian' {
if $::os_package_type == 'debian' { if $::operatingsystem == 'Debian' {
File<| title == '/var/log/swift' |> { File<| title == '/var/log/swift' |> {
owner => 'swift', owner => 'swift',
group => 'adm' group => 'adm'