Merge pull request #905 from ekohl/use-beaker-hiera

Better Hiera compatibility
voxpupuli · Nov 7, 2023 · e4c1c29 · e4c1c29
2 parents e4894b8 + 56e30df
commit e4c1c29
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 135 deletions.
diff --git a/README.md b/README.md
@@ -136,9 +136,6 @@ node 'zabbix.example.com' {
   class { 'apache':
     mpm_module => 'prefork',
   }
-  include apache::mod::php
-
-  class { 'postgresql::server': }
 
   class { 'zabbix':
     zabbix_url    => 'zabbix.example.com',
@@ -152,9 +149,6 @@ node 'zabbix.example.com' {
   class { 'apache':
     mpm_module => 'prefork',
   }
-  include apache::mod::php
-
-  class { 'mysql::server': }
 
   class { 'zabbix':
     zabbix_url    => 'zabbix.example.com',
@@ -215,8 +209,6 @@ Like the zabbix-server, the zabbix-proxy can also be used in 2 ways:
 The following is an example for using the PostgreSQL as database:
 ```ruby
 node 'proxy.example.com' {
-  class { 'postgresql::server': }
-
   class { 'zabbix::database':
     database_type => 'postgresql',
   }
@@ -231,8 +223,6 @@ node 'proxy.example.com' {
 When you want to make use of an MySQL database as backend:
 ```ruby
 node 'proxy.example.com' {
-  class { 'mysql::server': }
-
   class { 'zabbix::database':
     database_type => 'mysql',
   }

diff --git a/REFERENCE.md b/REFERENCE.md
@@ -4936,7 +4936,6 @@ node 'wdpuppet02.dj-wasabi.local' {
   class { 'apache':
       mpm_module => 'prefork',
   }
-  class { 'apache::mod::php': }
   class { 'zabbix::web':
     zabbix_url    => 'zabbix.dj-wasabi.nl',
     zabbix_server => 'wdpuppet03.dj-wasabi.local',

diff --git a/manifests/database.pp b/manifests/database.pp
@@ -94,12 +94,13 @@
     case $database_type {
       'postgresql': {
         # This is the PostgreSQL part.
+
+        include postgresql::server
         # Create the postgres database.
         postgresql::server::db { $database_name:
           user       => $database_user,
           owner      => $database_user,
           password   => postgresql::postgresql_password($database_user, $database_password),
-          require    => Class['postgresql::server'],
           tablespace => $database_tablespace,
         }
 
@@ -145,6 +146,7 @@
       }
       'mysql': {
         # This is the MySQL part.
+        include mysql::server
 
         # First we check what kind of zabbix component it is. We have to use clear names
         # as it may be confusing when you need to fill in the zabbix-proxy name into the

diff --git a/manifests/web.pp b/manifests/web.pp
@@ -82,7 +82,6 @@
 #     class { 'apache':
 #         mpm_module => 'prefork',
 #     }
-#     class { 'apache::mod::php': }
 #     class { 'zabbix::web':
 #       zabbix_url    => 'zabbix.dj-wasabi.nl',
 #       zabbix_server => 'wdpuppet03.dj-wasabi.local',
@@ -343,6 +342,8 @@
       }
     }
     else {
+      include apache::mod::php
+
       $apache_vhost_custom_fragment = "
         php_value max_execution_time ${apache_php_max_execution_time}
         php_value memory_limit ${apache_php_memory_limit}

diff --git a/spec/acceptance/hieradata/common.yaml b/spec/acceptance/hieradata/common.yaml
@@ -0,0 +1,7 @@
+---
+apache::mpm_module: 'prefork'
+
+postgresql::globals::encoding: 'UTF-8'
+postgresql::globals::locale: 'en_US.UTF-8'
+postgresql::globals::manage_package_repo: true
+postgresql::globals::version: '13'
diff --git a/spec/acceptance/hieradata/os/RedHat/8.yaml b/spec/acceptance/hieradata/os/RedHat/8.yaml
@@ -0,0 +1,3 @@
+---
+postgresql::globals::manage_dnf_module: true
+postgresql::globals::manage_package_repo: false
diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -16,15 +16,7 @@
 
       # this will actually deploy apache + postgres + zabbix-server + zabbix-web
       pp = <<-EOS
-        class { 'postgresql::globals':
-          encoding => 'UTF-8',
-          locale   => 'en_US.UTF-8',
-          manage_package_repo => $facts['os']['release']['major'] != '8',
-          manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '13',
-        }
-        -> class { 'postgresql::server': }
-        -> class { 'zabbix::database': }
+        class { 'zabbix::database': }
         -> class { 'zabbix::server': }
       EOS
 
@@ -66,15 +58,7 @@ class { 'postgresql::globals':
 
         # this will actually deploy apache + postgres + zabbix-server + zabbix-web
         pp = <<-EOS
-          class { 'postgresql::globals':
-            encoding => 'UTF-8',
-            locale   => 'en_US.UTF-8',
-            manage_package_repo => $facts['os']['release']['major'] != '8',
-            manage_dnf_module => $facts['os']['release']['major'] == '8',
-            version => '13',
-          }
-          -> class { 'postgresql::server': }
-          -> class { 'zabbix::database': }
+          class { 'zabbix::database': }
           -> class { 'zabbix::server':
             zabbix_version => "#{zabbix_version}"
           }

diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb
@@ -21,28 +21,13 @@
       # This will deploy a running Zabbix setup (server, web, db) which we can
       # use for custom type tests
       pp1 = <<-EOS
-        class { 'apache':
-            mpm_module => 'prefork',
-        }
-        if $facts['os']['family'] != 'RedHat' {
-          include apache::mod::php
-        }
-        class { 'postgresql::globals':
-          locale   => 'en_US.UTF-8',
-          manage_package_repo => $facts['os']['release']['major'] != '8',
-          manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '13',
-        }
-        -> class { 'postgresql::server': }
-
         class { 'zabbix':
           zabbix_version   => "#{zabbix_version}",
           zabbix_url       => 'localhost',
           zabbix_api_user  => 'Admin',
           zabbix_api_pass  => 'zabbix',
           apache_use_ssl   => false,
           manage_resources => true,
-          require          => [ Class['postgresql::server'], Class['apache'], ],
         }
 
       EOS

diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb
@@ -30,28 +30,13 @@
                       end
 
       pp1 = <<-EOS
-        class { 'apache':
-            mpm_module => 'prefork',
-        }
-        if $facts['os']['family'] != 'RedHat' {
-          include apache::mod::php
-        }
-        class { 'postgresql::globals':
-          locale   => 'en_US.UTF-8',
-          manage_package_repo => $facts['os']['release']['major'] != '8',
-          manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '13',
-        }
-        -> class { 'postgresql::server': }
-
         class { 'zabbix':
           zabbix_version   => "#{zabbix_version}",
           zabbix_url       => 'localhost',
           zabbix_api_user  => 'Admin',
           zabbix_api_pass  => 'zabbix',
           apache_use_ssl   => false,
           manage_resources => true,
-          require          => [ Class['postgresql::server'], Class['apache'], ],
         }
       EOS
 

diff --git a/spec/acceptance/zabbix_hostgroup_spec.rb b/spec/acceptance/zabbix_hostgroup_spec.rb
@@ -14,28 +14,13 @@
       # This will deploy a running Zabbix setup (server, web, db) which we can
       # use for custom type tests
       pp1 = <<-EOS
-        class { 'apache':
-            mpm_module => 'prefork',
-        }
-        if $facts['os']['family'] != 'RedHat' {
-          include apache::mod::php
-        }
-        class { 'postgresql::globals':
-          locale   => 'en_US.UTF-8',
-          manage_package_repo => $facts['os']['release']['major'] != '8',
-          manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '13',
-        }
-        -> class { 'postgresql::server': }
-
         class { 'zabbix':
           zabbix_version   => "#{zabbix_version}",
           zabbix_url       => 'localhost',
           zabbix_api_user  => 'Admin',
           zabbix_api_pass  => 'zabbix',
           apache_use_ssl   => false,
           manage_resources => true,
-          require          => [ Class['postgresql::server'], Class['apache'], ],
         }
       EOS
 

diff --git a/spec/acceptance/zabbix_proxy_spec.rb b/spec/acceptance/zabbix_proxy_spec.rb
@@ -15,28 +15,13 @@
       # This will deploy a running Zabbix setup (server, web, db) which we can
       # use for custom type tests
       pp1 = <<-EOS
-      class { 'apache':
-        mpm_module => 'prefork',
-      }
-      if $facts['os']['family'] != 'RedHat' {
-        include apache::mod::php
-      }
-      class { 'postgresql::globals':
-        locale   => 'en_US.UTF-8',
-        manage_package_repo => $facts['os']['release']['major'] != '8',
-        manage_dnf_module => $facts['os']['release']['major'] == '8',
-        version => '13',
-      }
-      -> class { 'postgresql::server': }
-
       class { 'zabbix':
         zabbix_version   => "#{zabbix_version}",
         zabbix_url       => 'localhost',
         zabbix_api_user  => 'Admin',
         zabbix_api_pass  => 'zabbix',
         apache_use_ssl   => false,
         manage_resources => true,
-        require          => [ Class['postgresql::server'], Class['apache'], ],
       }
       EOS
 

diff --git a/spec/acceptance/zabbix_template_host_spec.rb b/spec/acceptance/zabbix_template_host_spec.rb
@@ -23,28 +23,13 @@
       # This will deploy a running Zabbix setup (server, web, db) which we can
       # use for custom type tests
       pp1 = <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        if $facts['os']['family'] != 'RedHat' {
-          include apache::mod::php
-        }
-        class { 'postgresql::globals':
-          locale   => 'en_US.UTF-8',
-          manage_package_repo => $facts['os']['release']['major'] != '8',
-          manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '13',
-        }
-        -> class { 'postgresql::server': }
-
         class { 'zabbix':
           zabbix_version   => "#{zabbix_version}",
           zabbix_url       => 'localhost',
           zabbix_api_user  => 'Admin',
           zabbix_api_pass  => 'zabbix',
           apache_use_ssl   => false,
           manage_resources => true,
-          require          => [ Class['postgresql::server'], Class['apache'], ],
         }
       EOS
 

diff --git a/spec/acceptance/zabbix_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb
@@ -14,28 +14,13 @@
       # This will deploy a running Zabbix setup (server, web, db) which we can
       # use for custom type tests
       pp1 = <<-EOS
-          class { 'apache':
-              mpm_module => 'prefork',
-          }
-          if $facts['os']['family'] != 'RedHat' {
-            include apache::mod::php
-          }
-          class { 'postgresql::globals':
-            locale   => 'en_US.UTF-8',
-            manage_package_repo => $facts['os']['release']['major'] != '8',
-            manage_dnf_module => $facts['os']['release']['major'] == '8',
-            version => '13',
-          }
-          -> class { 'postgresql::server': }
-
           class { 'zabbix':
             zabbix_version   => "#{zabbix_version}",
             zabbix_url       => 'localhost',
             zabbix_api_user  => 'Admin',
             zabbix_api_pass  => 'zabbix',
             apache_use_ssl   => false,
             manage_resources => true,
-            require          => [ Class['postgresql::server'], Class['apache'], ],
           }
       EOS
 

diff --git a/spec/classes/database_mysql_spec.rb b/spec/classes/database_mysql_spec.rb
@@ -7,10 +7,6 @@
     'rspec.puppet.com'
   end
 
-  let :pre_condition do
-    "include 'mysql::server'"
-  end
-
   on_supported_os(baseline_os_hash).each do |os, facts|
     next if facts[:os]['name'] == 'windows'
 

diff --git a/spec/classes/database_spec.rb b/spec/classes/database_spec.rb
@@ -17,14 +17,12 @@
 
       let :pre_condition do
         <<-EOS
-          include 'postgresql::server'
           if $facts['os']['family'] == 'Gentoo' {
             # We don't need the package to be installed as its the same for the server.
             class { 'mysql::client':
               package_manage => false,
             }
           }
-          include 'mysql::server'
         EOS
       end
 

diff --git a/spec/classes/proxy_spec.rb b/spec/classes/proxy_spec.rb
@@ -27,10 +27,6 @@
           it { is_expected.not_to compile }
         end
       else
-        let :pre_condition do
-          "include 'postgresql::server'
-           include 'mysql::server'"
-        end
         let :params do
           {
             zabbix_server_host: '192.168.1.1',
@@ -133,10 +129,6 @@
             }
           end
 
-          let(:pre_condition) do
-            "include 'mysql::server'"
-          end
-
           it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_type('proxy') }
           it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_version(zabbix_version) }
           it { is_expected.to contain_class('zabbix::database::mysql').with_database_name('zabbix_proxy') }

diff --git a/spec/classes/web_spec.rb b/spec/classes/web_spec.rb
@@ -14,6 +14,16 @@
     }
   end
 
+  let :pre_condition do
+    <<~PUPPET
+      if $facts['os']['family'] != 'RedHat' {
+        class { 'apache':
+          mpm_module => 'prefork',
+        }
+      }
+    PUPPET
+  end
+
   on_supported_os(baseline_os_hash).each do |os, facts|
     supported_versions.each do |zabbix_version|
       next if facts[:os]['name'] == 'windows'