diff options
| author | Micah Anderson <micah@riseup.net> | 2013-06-19 15:54:59 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-06-19 15:54:59 -0400 |
| commit | 8259e18e06fe1535ad931e4c45dfe2583443f162 (patch) | |
| tree | 4f8ff484d30f76fb76470d9f6148ed844b3715f2 /puppet/modules/site_config/manifests/default.pp | |
| parent | e66040d2180546541bd075ebc40548f3c8de87f4 (diff) | |
| parent | 16b2a5593ce4ced4a21635b0638147bff250d13f (diff) | |
Merge branch 'develop' into leap
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 |