Merge pull request #91 from intelliad-media/master

Fixed the mesos_version variable check, which fails if the puppet ser…
deric · Jan 18, 2019 · 1d8cb88 · 1d8cb88
2 parents e360081 + 52949da
commit 1d8cb88
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/manifests/slave.pp b/manifests/slave.pp
@@ -146,10 +146,14 @@
     $credentials_ensure = absent
   }
 
-  if ($::mesos_version != undef) and (versioncmp($::mesos_version, '0.28.0') >= 0)
-    and $service_provider != 'systemd' {
-    # otherwise rely on mesos-slave defaults
-      $systemd_support = {'systemd_enable_support' => false}
+  if defined('$::mesos_version') {
+    if ($::mesos_version != undef) and (versioncmp($::mesos_version, '0.28.0') >= 0)
+      and $service_provider != 'systemd' {
+      # otherwise rely on mesos-slave defaults
+        $systemd_support = {'systemd_enable_support' => false}
+    } else {
+      $systemd_support = {}
+    }
   } else {
     $systemd_support = {}
   }