explicit dnf module in acceptance

voxpupuli · Oct 3, 2023 · 1c03ef7 · 1c03ef7
1 parent bf1992b
commit 1c03ef7
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -19,7 +19,8 @@
         class { 'postgresql::globals':
           encoding => 'UTF-8',
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }

diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb
@@ -27,7 +27,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }

diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb
@@ -38,7 +38,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }

diff --git a/spec/acceptance/zabbix_hostgroup_spec.rb b/spec/acceptance/zabbix_hostgroup_spec.rb
@@ -18,7 +18,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }

diff --git a/spec/acceptance/zabbix_proxy_spec.rb b/spec/acceptance/zabbix_proxy_spec.rb
@@ -19,7 +19,8 @@ class { 'apache':
       include apache::mod::php
       class { 'postgresql::globals':
         locale   => 'en_US.UTF-8',
-        manage_package_repo => true,
+        manage_package_repo => $facts[:os]['release']['major'] != '8',
+        manage_dnf_module => $facts[:os]['release']['major'] == '8',
         version => '12',
       }
       -> class { 'postgresql::server': }

diff --git a/spec/acceptance/zabbix_template_host_spec.rb b/spec/acceptance/zabbix_template_host_spec.rb
@@ -29,7 +29,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }

diff --git a/spec/acceptance/zabbix_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb
@@ -18,7 +18,8 @@ class { 'apache':
           include apache::mod::php
           class { 'postgresql::globals':
             locale   => 'en_US.UTF-8',
-            manage_package_repo => true,
+            manage_package_repo => $facts[:os]['release']['major'] != '8',
+            manage_dnf_module => $facts[:os]['release']['major'] == '8',
             version => '12',
           }
           -> class { 'postgresql::server': }