summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/hydra/misc1
-rwxr-xr-xshare/hydractl/puppet-enable5
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/hydra/misc b/lib/hydra/misc
index f56fdda..d8dfb3b 100644
--- 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 8579081..b29603c 100755
--- 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"