Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/217765
Change subject: Update labs_bootstrapvz to catch up with resolv.conf changes
......................................................................
Update labs_bootstrapvz to catch up with resolv.conf changes
Change-Id: Ibe758d476f78a63f2f48d26b3a4e90c21fb0d629
---
M modules/labs_bootstrapvz/files/firstboot.sh
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/217765/1
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index 35cbf2a..1f9b554 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -96,7 +96,20 @@
sed -i "s/_PROJECT_/${project}/g" /etc/nslcd.conf
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
+
+# Set resolv.conf and stop anyone else from messing with it.
+echo "" > /sbin/resolvconf
+mkdir /etc/dhcp/dhclient-enter-hooks.d
+echo ":#!/bin/sh" > /etc/dhcp/dhclient-enter-hooks.d/nodnsupdate
+echo "make_resolv_conf() {" >> /etc/dhcp/dhclient-enter-hooks.d/nodnsupdate
+echo " :" >> /etc/dhcp/dhclient-enter-hooks.d/nodnsupdate
+echo "}" >> /etc/dhcp/dhclient-enter-hooks.d/nodnsupdate
+grep domain /etc/resolv.conf
+if [ $? -eq 0 ]; then
+ sed -i "s/^domain .*$/domain ${project}.${domain}/g" /etc/resolv.conf
+else
+ echo "domain ${project}.${domain}" >> /etc/resolv.conf
+fi
# This is only needed when running bootstrap-vz on
# a puppetmaster::self instance, and even then
--
To view, visit https://gerrit.wikimedia.org/r/217765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe758d476f78a63f2f48d26b3a4e90c21fb0d629
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
