Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/317554
Change subject: Labs images: Only add fqdn of instance to /etc/hosts ...................................................................... Labs images: Only add fqdn of instance to /etc/hosts Adding the simple hostname seems to break hostname -d Bug: T120830 Change-Id: Ib100fed1d8e3d93f5aee385ac403f575f3fe0be4 --- M modules/labs_bootstrapvz/files/firstboot.sh M modules/labs_vmbuilder/files/firstboot.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/317554/1 diff --git a/modules/labs_bootstrapvz/files/firstboot.sh b/modules/labs_bootstrapvz/files/firstboot.sh index 5d86d25..fe5e3d4 100644 --- a/modules/labs_bootstrapvz/files/firstboot.sh +++ b/modules/labs_bootstrapvz/files/firstboot.sh @@ -141,7 +141,7 @@ options timeout:5 ndots:2 EOF -echo "$ip $hostname $fqdn" >> /etc/hosts +echo "$ip $fqdn" >> /etc/hosts # This is only needed when running bootstrap-vz on # a puppetmaster::self instance, and even then diff --git a/modules/labs_vmbuilder/files/firstboot.sh b/modules/labs_vmbuilder/files/firstboot.sh index e110c01..1f11287 100644 --- a/modules/labs_vmbuilder/files/firstboot.sh +++ b/modules/labs_vmbuilder/files/firstboot.sh @@ -83,7 +83,7 @@ options timeout:5 ndots:2 EOF -echo "$ip $hostname $fqdn" >> /etc/hosts +echo "$ip $fqdn" >> /etc/hosts /etc/init.d/nslcd restart /etc/init.d/nscd restart -- To view, visit https://gerrit.wikimedia.org/r/317554 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib100fed1d8e3d93f5aee385ac403f575f3fe0be4 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
