Andrew Bogott has submitted this change and it was merged.
Change subject: Labs: Mute client-side notifications for wikitech Puppet status
......................................................................
Labs: Mute client-side notifications for wikitech Puppet status
Labs instances use notify resources as part of role::labs::instance
that are processed by the Labs puppet master's labsstatus report
processor to update the instance's Puppet status on wikitech. These
resources are noisy and also lead to all Puppet runs exiting with
status 2 ("there were changes").
This change replace the resources with calls to notice(). These still
emit the notifications to the Puppet master, but do not produce output
on the client and are not counted as "changes". Thus Puppet exits
with status 0 if there were no changes or failures, making it easier
to use in test scripts.
Change-Id: I0034171943bab2f7920a4985ea879275de6d6c62
---
M manifests/role/labs.pp
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 2db88dd..837fdb3 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -186,8 +186,9 @@
hiera_include('classes', [])
- # The next two notifications are read in by the labsstatus.rb puppet
report handler.
- # It needs to know project/hostname for nova access.
- notify{"instanceproject: ${::instanceproject}":}
- notify{"hostname: ${::instancename}":}
+ # These notifications are processed by the labsstatus.rb Puppet
+ # report handler. It needs to know project/hostname to update the
+ # instance's Puppet status on wikitech.
+ notice("instanceproject: ${::instanceproject}")
+ notice("hostname: ${::instancename}")
}
--
To view, visit https://gerrit.wikimedia.org/r/203062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0034171943bab2f7920a4985ea879275de6d6c62
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
