[#42131657] Update lock path for Puppet 3.x

dcarley · dcarley · commit 7f85d0d91815 · 2013-07-15T17:53:37.000+01:00
Puppet 3.x now uses separate lock files for "running" and "disabled": http://docs.puppetlabs.com/puppet/3/reference/whats_new.html#changes-to-agent-lockfile-behavior I did test using `puppet agent --configprint` to fetch the value. However it doubles the runtime for this simple operation. Similarly, I tried maintaining compat with Puppet 2.7, but it was slow and a terrible mess of conditional Bash. This will break compat with Puppet 2.7 -- which should only be in staging/prod for the next couple of days. Nagios will however continue to report freshness checks.
diff --git a/puppet.py b/puppet.py
@@ -21,12 +21,10 @@ def enable():
 @task
 def check_disabled():
     """Check if puppet runs are disabled"""
-    lockfile = '/var/lib/puppet/state/puppetdlock'
+    lockfile = '/var/lib/puppet/state/agent_disabled.lock'
 
-    # Puppet is disabled if the lockfile exists and has zero size (whereas a
-    # running puppet agent will write its PID to the lockfile)
     with hide('running'):
-        run('test -e {0} -a ! -s {0} && echo DISABLED || echo ENABLED'.format(lockfile))
+        run('test -f {0} && echo DISABLED || echo ENABLED'.format(lockfile))
 
 @task
 def dryrun(*args):
