Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/317556
Change subject: Revert "labs firstboot.sh: Add instance hostname to /etc/hosts" ...................................................................... Revert "labs firstboot.sh: Add instance hostname to /etc/hosts" This breaks hostname -d and prevents instances from coming up properly. This reverts commit 8fa387cb06272ac5d4cbe70322fef7071695a792. Change-Id: Ia1df625e7d7863f3538f3f8c3a17ff40a4d88106 --- M modules/labs_bootstrapvz/files/firstboot.sh M modules/labs_vmbuilder/files/firstboot.sh 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/317556/1 diff --git a/modules/labs_bootstrapvz/files/firstboot.sh b/modules/labs_bootstrapvz/files/firstboot.sh index 5d86d25..f11a2e7 100644 --- a/modules/labs_bootstrapvz/files/firstboot.sh +++ b/modules/labs_bootstrapvz/files/firstboot.sh @@ -141,8 +141,6 @@ options timeout:5 ndots:2 EOF -echo "$ip $hostname $fqdn" >> /etc/hosts - # This is only needed when running bootstrap-vz on # a puppetmaster::self instance, and even then # it isn't perfect diff --git a/modules/labs_vmbuilder/files/firstboot.sh b/modules/labs_vmbuilder/files/firstboot.sh index e110c01..79ad558 100644 --- a/modules/labs_vmbuilder/files/firstboot.sh +++ b/modules/labs_vmbuilder/files/firstboot.sh @@ -83,8 +83,6 @@ options timeout:5 ndots:2 EOF -echo "$ip $hostname $fqdn" >> /etc/hosts - /etc/init.d/nslcd restart /etc/init.d/nscd restart dpkg-reconfigure -fnoninteractive -pcritical openssh-server -- To view, visit https://gerrit.wikimedia.org/r/317556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1df625e7d7863f3538f3f8c3a17ff40a4d88106 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
