Ryan Lane has submitted this change and it was merged.
Change subject: Remove run once logic from firstboot.sh
......................................................................
Remove run once logic from firstboot.sh
Run once logic is already added by vm-builder itself, so there's
no need for the logic in the script.
Change-Id: Icaeafcb477858f3be6de295314789357844fb2a7
---
M modules/labs_vmbuilder/files/firstboot.sh
1 file changed, 0 insertions(+), 8 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_vmbuilder/files/firstboot.sh
b/modules/labs_vmbuilder/files/firstboot.sh
index 978b5a3..e8e5ece 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -1,11 +1,5 @@
#!/bin/bash
-if [ -f '/root/.firstboot' ]
-then
- # Only run firstboot once
- exit
-fi
-
echo 'Enabling console logging for puppet while it does the initial run'
echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
restart rsyslog
@@ -51,5 +45,3 @@
# Force initial puppet run
puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff
--waitforcert=10 --certname=${idfqdn} --server=${master}
-
-touch /root/.firstboot
--
To view, visit https://gerrit.wikimedia.org/r/102034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaeafcb477858f3be6de295314789357844fb2a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
