Addressing top-scope facts

Author: LukasAud

manifests/init.pp

@@ -244,7 +244,7 @@
 #   ```puppet
 #   include apache::params
 #   class { 'apache':
-#     mod_libs => merge($::apache::params::mod_libs, {
+#     mod_libs => merge($apache::params::mod_libs, {
 #       'wsgi' => 'mod_wsgi_python3.so',
 #     })
 #   }
@@ -255,7 +255,7 @@
 #   ```puppet
 #   include apache::params
 #   class { 'apache':
-#     mod_packages => merge($::apache::params::mod_packages, {
+#     mod_packages => merge($apache::params::mod_packages, {
 #       'auth_kerb' => 'httpd24-mod_auth_kerb',
 #     })
 #   }

spec/acceptance/vhost_spec.rb

@@ -10,11 +10,11 @@ class { 'apache':
         default_ssl_vhost => false,
         service_ensure => stopped,
       }
-      if ($facts['os']['family'] == 'Suse' and $::operatingsystemrelease < '15') {
+      if ($facts['os']['family'] == 'Suse' and $facts['os']['release']['major'] < '15') {
         exec { '/usr/bin/gensslcert':
           require => Class['apache'],
         }
-      } elsif ($facts['os']['family'] == 'Suse' and $::operatingsystemrelease >= '15') {
+      } elsif ($facts['os']['family'] == 'Suse' and $facts['os']['release']['major'] >= '15') {
         # In SLES 15, if not given a name, gensslcert defaults the name to be the hostname
         exec { '/usr/bin/gensslcert -n default':
           require => Class['apache'],

spec/classes/mod/auth_kerb_spec.rb

@@ -46,7 +46,7 @@
         <<-MANIFEST
         include apache::params
         class { 'apache':
-          mod_packages => merge($::apache::params::mod_packages, {
+          mod_packages => merge($apache::params::mod_packages, {
             'auth_kerb' => 'httpd24-mod_auth_kerb',
           })
         }

spec/classes/mod/auth_openidc_spec.rb

@@ -55,7 +55,7 @@
         <<-MANIFEST
         include apache::params
         class { 'apache':
-          mod_packages => merge($::apache::params::mod_packages, {
+          mod_packages => merge($apache::params::mod_packages, {
             'auth_openidc' => 'httpd24-mod_auth_openidc',
           })
         }

spec/classes/mod/wsgi_spec.rb

@@ -136,10 +136,10 @@
         <<-MANIFEST
         include apache::params
         class { 'apache':
-          mod_packages => merge($::apache::params::mod_packages, {
+          mod_packages => merge($apache::params::mod_packages, {
             'wsgi' => 'python3-mod_wsgi',
           }),
-          mod_libs => merge($::apache::params::mod_libs, {
+          mod_libs => merge($apache::params::mod_libs, {
             'wsgi' => 'mod_wsgi_python3.so',
           })
         }