Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/369837 )
Change subject: vmbuilder: update-rc.d -f puppet remove ...................................................................... vmbuilder: update-rc.d -f puppet remove Removing init.d/puppet was overkill, and also upsetting a puppet stage that explicitly turns it off. Surely this will prevent it from trying to do anything at boot time. Bug: T172064 Change-Id: Iad42f912f7c1677b26d7c238cf46042246b5827e --- M modules/labs_vmbuilder/files/postinst.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/labs_vmbuilder/files/postinst.sh b/modules/labs_vmbuilder/files/postinst.sh index 7f90aaa..e06ac66 100644 --- a/modules/labs_vmbuilder/files/postinst.sh +++ b/modules/labs_vmbuilder/files/postinst.sh @@ -27,7 +27,7 @@ puppet agent --disable /etc/init.d/puppet stop /usr/bin/killall puppet - rm /etc/init.d/puppet + update-rc.d -f puppet remove 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/369837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad42f912f7c1677b26d7c238cf46042246b5827e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
