Merge "Remove usage of custom os_package_type fact"

manifests/init.pp

@@ -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.")
       }

manifests/wsgi/uwsgi.pp

@@ -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.')
   }