Andrew Bogott has submitted this change and it was merged.
Change subject: Rearrange the order of flushing nscd just to be sure.
......................................................................
Rearrange the order of flushing nscd just to be sure.
Change-Id: I050b915e8788ce3d06f32f6a59f1b5faf3ec6a36
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index c9e7090..35cbf2a 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -97,18 +97,17 @@
sed -i "s/_FQDN_/${fqdn}/g" /etc/puppet/puppet.conf
sed -i "s/_MASTER_/${master}/g" /etc/puppet/puppet.conf
sed -i "s/^domain .*$/domain ${fqdn}/g" /etc/resolv.conf
-nscd -i hosts
# This is only needed when running bootstrap-vz on
# a puppetmaster::self instance, and even then
# it isn't perfect
mkdir /var/lib/puppet/client
-
systemctl restart nslcd.service
systemctl restart nscd.service
dpkg-reconfigure -fnoninteractive -pcritical openssh-server
systemctl restart ssh.service
+nscd -i hosts
# set mailname
echo $fqdn > /etc/mailname
diff --git a/modules/labs_vmbuilder/files/firstboot.sh
b/modules/labs_vmbuilder/files/firstboot.sh
index b3f22b3..67f0adc 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -73,13 +73,13 @@
sed -i "s/_FQDN_/${fqdn}/g" /etc/puppet/puppet.conf
sed -i "s/_MASTER_/${master}/g" /etc/puppet/puppet.conf
sed -i "s/^domain .*$/domain ${fqdn}/g" /etc/resolv.conf
-nscd -i hosts
/etc/init.d/nslcd restart
/etc/init.d/nscd restart
dpkg-reconfigure -fnoninteractive -pcritical openssh-server
/etc/init.d/ssh stop
/etc/init.d/ssh start
+nscd -i hosts
# set mailname
echo $fqdn > /etc/mailname
--
To view, visit https://gerrit.wikimedia.org/r/217725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I050b915e8788ce3d06f32f6a59f1b5faf3ec6a36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
