Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369833 )

Change subject: vmbuilder: rm /etc/init.d/puppet in image
......................................................................

vmbuilder: rm /etc/init.d/puppet in image

Because even though we...
- run puppet agent --disable...
- and set daemonize=false in puppet conf...
- and I tried setting RUN=no in the defaults...

puppet STILL tries to start up on first boot, hangs,
and ruins everything.

We start puppet in the firstboot script, when we're ready.  After
that, it's managed by a cron.  We never use this init script.

Bug: T172064
Change-Id: I895f3970db8bea3705f968f4681fd36fc0126f2c
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/369833/1

diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index 58a2c38..7f90aaa 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -27,6 +27,7 @@
   puppet agent --disable
   /etc/init.d/puppet stop
   /usr/bin/killall puppet
+  rm /etc/init.d/puppet
   mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
   mv /etc/default/puppet.install /etc/default/puppet
   rm /etc/ssh/ssh_host*key*

-- 
To view, visit https://gerrit.wikimedia.org/r/369833
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I895f3970db8bea3705f968f4681fd36fc0126f2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to