Fix zabbixapi versions

Signed-off-by: Christos Papageorgiou <[email protected]>
voxpupuli · Mar 6, 2021 · a54f037 · a54f037
1 parent 6266183
commit a54f037
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/manifests/web.pp b/manifests/web.pp
@@ -281,10 +281,10 @@
       '2.4': {
         $zabbixapi_version = '2.4.4'
       }
-      '3.2': {
+      '3.2' : {
         $zabbixapi_version = '3.2.1'
       }
-      '3.4': {
+      '3.4' : {
         $zabbixapi_version = '4.0.0'
       }
       '4.0': {
@@ -293,9 +293,12 @@
       '4.4': {
         $zabbixapi_version = '4.2.0'
       }
-      default : {
+      /^5\.[02]/: {
         $zabbixapi_version = '5.0.0-alpha1'
       }
+      default: {
+        fail("Zabbix ${zabbix_version} is not supported!")
+      }
     }
 
     # Installing the zabbixapi gem package. We need this gem for

diff --git a/spec/support/acceptance/prepare_host.rb b/spec/support/acceptance/prepare_host.rb
@@ -19,7 +19,7 @@ def prepare_host
   /opt/puppetlabs/bin/puppet resource package zabbix-web-pgsql-scl ensure=purged
   /opt/puppetlabs/bin/puppet resource package zabbix-web-mysql-scl ensure=purged
   /opt/puppetlabs/bin/puppet resource package zabbix-frontend-php ensure=purged
-  /opt/puppetlabs/bin/puppet/gem uninstall zabbixapi -a
+  /opt/puppetlabs/puppet/bin/gem uninstall zabbixapi -a
   rm -f /etc/zabbix/.*done
   if id postgres > /dev/null 2>&1; then
     su - postgres -c "psql -c 'drop database if exists zabbix_server;'"