Newer systems are masterless

diff --git a/lib/hydra/misc b/lib/hydra/misc
index f56fddaaa1c6c4f3ede9768d61450c9dd743b0c3..d8dfb3babb09eaa2d05c9afa87e667e0a290b46d 100644 (file)
--- a/lib/hydra/misc
+++ b/lib/hydra/misc
@@ -2,6 +2,7 @@
 
 # Set needed environment variables and do basic checks
 function hydra_set_env {
+  export OSVERSION="`cut -d . -f 1 /etc/debian_version`"
   export COMMIT="`( cd $APP_BASE && git log -n 1 --pretty=oneline 2> /dev/null | cut -d " " -f 1 )`"
   export CONFIG="$HOME/.hydra/config"
   export ACTION="$1"

diff --git a/share/hydractl/puppet-enable b/share/hydractl/puppet-enable
index 8579081639b9eb7892e9d1bec32409d8822a55e1..b29603c6e83891837da9da28c5e951cb184768f2 100755 (executable)
--- a/share/hydractl/puppet-enable
+++ b/share/hydractl/puppet-enable
@@ -23,6 +23,11 @@ hydra_config_load
 # Command line arguments
 BASENAME="`basename $0`"
 
+# Newer systems are masterless
+if [ "$OSVERSION" != "7" ]; then
+  exit
+fi
+
 # Set sudo config
 if [ "`whoami`" != 'root' ]; then
   sudo="sudo"