[05:09:25] <marostegui>	 There's an alert about unmerged changed in puppet that's been there for 5h
[05:10:09] <marostegui>	 https://gerrit.wikimedia.org/r/c/operations/puppet/+/803373 and https://gerrit.wikimedia.org/r/c/operations/puppet/+/803366
[05:10:37] <marostegui>	 I am going to run the merge and if something fails, we can just revert them
[05:11:58] <marostegui>	 The merge is failing: https://phabricator.wikimedia.org/P29448
[05:13:01] <marostegui>	 I am going to leave that for someone with more expertise on our puppet repo
[05:34:08] <elukey>	 marostegui: o/
[05:34:36] <elukey>	 I just noticed this after a +2 :)
[05:35:17] <marostegui>	 hehe same
[05:40:01] <elukey>	 I checked /var/lib/git/operations/puppet on puppetmaster1001 and I see 
[05:40:07] <elukey>	 modified:   modules/install_server/files/autoinstall/partman/hwraid-2dev.cfg
[05:40:28] <elukey>	 showing one of Papaul's commits
[05:41:52] <elukey>	 I'd be tempted to checkout the .cfg file or similar to clean up the state, but it is weird that we ended up in this situation
[05:42:10] <elukey>	 I have to go in a bit for a doctor appointment, my change can be merged anytime
[06:55:06] <slyngs>	 elukey: 
[06:55:15] <slyngs>	 elukey: Okay to merge your commit?
[06:55:37] <slyngs>	 Ah, you wrote above, I'll merge it along with mine
[06:55:39] <marostegui>	 slyngs: unless you've fixed the issue with the puppet repo, the merge will fail :)
[06:58:56] <volans>	 marostegui, slyngs, elukey: I've git checkout that file and saved the outstanding diff in a Phab paste https://phabricator.wikimedia.org/P29459
[06:59:11] <volans>	 as we can't stay with puppet blocked from merges any longer IMHO
[06:59:17] <marostegui>	 volans: yeah I agree
[06:59:44] <marostegui>	 Thanks volans 
[07:00:14] <volans>	 I think there were tests to try to fix a host that fails partman (looking at SAL for the reimage cookbook) and might have been left there
[07:00:17] <slyngs>	 Thank you :-)
[07:00:36] <volans>	 I'll leave the puppet-merge to you that have ouustanding commits to merge
[07:00:47] <marostegui>	 My change can be merged anytime as well 
[07:00:48] <slyngs>	 I handle those
[07:01:07] <volans>	 let me check the other puppetmasters just in case
[07:01:10] <slyngs>	 Happy little Puppet merge :-)
[07:02:22] <volans>	 confirmed all clear with: sudo cumin 'A:puppetmaster' 'git -C /var/lib/git/operations/puppet status'
[08:38:56] <elukey>	 thanks volans :)
[11:11:50] <jbond>	 fyi, i just merged some very simple pre-commit and pre-push hooks i use for the puppet repo https://gerrit.wikimedia.org/r/c/operations/puppet/+/803474
[11:13:35] <btullis>	 jbond: Nice one, thanks.
[11:17:46] <godog>	 I'll be afk for ~1h (currently oncall), cc jayme (already informed anyways)
[12:26:34] <XioNoX>	 Hi! we're going to do some maintenance on Netbox in the next few minutes, planning for 30min but it should be less. Please don't use write to Netbox for that time being, either directly or through cookbooks.
[12:32:30] <volans>	 XioNoX, jbond: need a hand for the switch?
[12:32:53] <XioNoX>	 volans: thanks, will let you know if needed!
[12:32:57] <volans>	 ack, thx
[12:50:33] <jbond>	 hi all i plan to do a reimage of sretest1001 in about 5 mins to test the reiamge cook book (cc moritzm )
[12:54:21] <volans>	 ack, thx
[12:56:20] <moritzm>	 go ahead :-)
[15:04:05] <jbond>	 fyi there was a small error in the aformentioned pre-commit which i have now fixed