Paste P7845

shinken-02 puppet diff 2018-11-26
ActivePublic

Authored by Krenair on Mon, Nov 26, 9:05 PM.
Info: Using configured environment 'production'
Info: Retrieving pluginfacts
Info: Retrieving plugin
Info: Loading facts
Info: Caching catalog for shinken-02.shinken.eqiad.wmflabs
Notice: /Stage[main]/Base::Environment/Tidy[/var/tmp/core]: Tidying 0 files
Info: Applying configuration version '1543266193'
Notice: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/notify_maintainers.py]/content:
--- /usr/local/sbin/notify_maintainers.py 2018-11-26 20:54:51.276766374 +0000
+++ /tmp/puppet-file20181126-16873-1vc7ohz 2018-11-26 21:03:21.566231366 +0000
@@ -46,7 +46,7 @@
config = yaml.safe_load(f)
conn = connect(config['servers'][0], config['user'], config['password'])
- roledn = "cn=%s,ou=groups,%s" % ('project-' + project_name,
+ roledn = "cn=projectadmin,cn=%s,ou=projects,%s" % (project_name,
config['basedn'])
body = msg
@@ -55,8 +55,7 @@
roledn,
ldap.SCOPE_BASE
)
- print adminrec
- admins = adminrec[0][1]['member']
+ admins = adminrec[0][1]['roleOccupant']
for admin in admins:
if admin.lower() in USER_IGNORE_LIST:
Info: Computing checksum on file /usr/local/sbin/notify_maintainers.py
Info: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/notify_maintainers.py]: Filebucketed /usr/local/sbin/notify_maintainers.py to puppet with sum 1349c747ad9a10e92a07e183a0063420
Notice: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/notify_maintainers.py]/content:
Notice: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/notify_maintainers.py]/content: content changed '{md5}1349c747ad9a10e92a07e183a0063420' to '{md5}eba16b7d7a4364b7b112d04f201b043f'
Notice: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/puppet_alert.py]/content:
--- /usr/local/sbin/puppet_alert.py 2018-11-26 20:48:16.636559622 +0000
+++ /tmp/puppet-file20181126-16873-5q8s5y 2018-11-26 21:03:21.734233167 +0000
@@ -26,7 +26,7 @@
import socket
# Nag if it's been 24 hours since the last puppet run
-NAG_INTERVAL = 60
+NAG_INTERVAL = 60 * 60 * 24
# Don't bother to notify the novaadmin user; that just
# sends spam to ops@
Info: Computing checksum on file /usr/local/sbin/puppet_alert.py
Info: FileBucket got a duplicate file {md5}4b66f1d76f0ea1e546a0d1e7e3c91b3e
Info: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/puppet_alert.py]: Filebucketed /usr/local/sbin/puppet_alert.py to puppet with sum 4b66f1d76f0ea1e546a0d1e7e3c91b3e
Notice: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/puppet_alert.py]/content:
Notice: /Stage[main]/Profile::Base::Labs/File[/usr/local/sbin/puppet_alert.py]/content: content changed '{md5}4b66f1d76f0ea1e546a0d1e7e3c91b3e' to '{md5}b93d367a86a579fc38e7f8e7745ae0b6'
Notice: Applied catalog in 14.86 seconds
Krenair created this paste.Mon, Nov 26, 9:05 PM