Merge "Remove usage of custom os_package_type fact"

manifests/ceph.pp

@@ -25,7 +25,7 @@ class openstack_integration::ceph (
 
   # 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.
-  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) {
 
     ensure_resource('package', 'python3-rbd', {

manifests/placement.pp

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

manifests/redis.pp

@@ -26,7 +26,7 @@ class openstack_integration::redis {
   # 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 with systemd errors.
-  if ($::os_package_type == 'debian') {
+  if ($::operatingsystem == 'Debian') {
     $service_enable = false
   } else {
     $service_enable = true

manifests/repos.pp

@@ -8,8 +8,8 @@ class openstack_integration::repos {
   }
   case $::osfamily {
     'Debian': {
-      case $::os_package_type {
-        'ubuntu': {
+      case $::operatingsystem {
+        'Ubuntu': {
           include apt
           class { 'openstack_extras::repo::debian::ubuntu':
             release         => 'wallaby',
@@ -17,7 +17,7 @@ class openstack_integration::repos {
             uca_location    => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
           }
         }
-        'debian': {
+        'Debian': {
           include apt
           class { 'openstack_extras::repo::debian::debian':
             release         => 'ussuri',
@@ -25,7 +25,7 @@ class openstack_integration::repos {
           }
         }
         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

manifests/sahara.pp

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

manifests/swift.pp

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