Ema has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268684
Change subject: Display a message in motd if puppet agent is disabled
......................................................................
Display a message in motd if puppet agent is disabled
Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
---
A modules/base/files/puppet/98-puppet-agent-disabled
M modules/base/manifests/puppet.pp
2 files changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/268684/1
diff --git a/modules/base/files/puppet/98-puppet-agent-disabled
b/modules/base/files/puppet/98-puppet-agent-disabled
new file mode 100644
index 0000000..1b385b0
--- /dev/null
+++ b/modules/base/files/puppet/98-puppet-agent-disabled
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Script displaying a message if Puppet agent is disabled.
+
+PATH=/bin:/usr/bin
+
+lockfile="/var/lib/puppet/state/agent_disabled.lock"
+
+if test -f $lockfile; then
+ reason="$(jq -r '.disabled_message' $lockfile 2>/dev/null)"
+ echo "Puppet disabled. $reason"
+fi
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index b4e0872..6fb5fe3 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -95,4 +95,10 @@
priority => 97,
source => 'puppet:///modules/base/puppet/97-last-puppet-run',
}
+
+ motd::script { 'puppet-agent-disabled':
+ ensure => present,
+ priority => 98,
+ source => 'puppet:///modules/base/puppet/98-puppet-agent-disabled',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/268684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
