diff options
| author | Micah Anderson <micah@riseup.net> | 2013-06-19 13:41:23 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-06-19 13:41:23 -0400 |
| commit | d9614163ed327fc17d27ac623dfd639ce00a43ce (patch) | |
| tree | 4f8ff484d30f76fb76470d9f6148ed844b3715f2 /puppet/modules/site_config/manifests/default.pp | |
| parent | cd9f0dc7d3fed744ea9bf695a497845a7297e1ca (diff) | |
disable dhclient from modifying the /etc/resolv.conf file on openstack/amazon instances
The dhclient in these environments is quite aggressive and overwrites the
nameservers we've deliberately chosen to use with google's nameservers. This
commit attempts to fix that.
The dhclient methodology for altering these things is particularly
unpleasant. We effectively redefine the functions that mess with this file to be
noops in the /etc/dhcp/dhclient-enter-hooks.d directory and then we are forced
to restart dhclient by shipping a script that tries to determine the correct PID
and arguments that it was running as before killing and restarting it with the
same arguments.
See debian bugs #681698, #712796 for further discussion about how to make this
less difficult
Change-Id: I51cf40cf98eaddcefd8180e157b6e3ca824173f0
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index cfb46130..5518ea56 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -12,10 +12,14 @@ class site_config::default { # configure apt include site_apt - # configure ssh and include ssh-keys include site_config::sshd + # fix dhclient from changing resolver information + if $::ec2_instance_id { + include site_config::dhclient + } + # configure /etc/resolv.conf include site_config::resolvconf |