diff options
| author | micah <micah@leap.se> | 2013-06-19 21:53:51 +0200 |
|---|---|---|
| committer | micah <micah@leap.se> | 2013-06-19 21:53:51 +0200 |
| commit | 16b2a5593ce4ced4a21635b0638147bff250d13f (patch) | |
| tree | 4f8ff484d30f76fb76470d9f6148ed844b3715f2 /puppet/modules/site_config/manifests/default.pp | |
| parent | cd9f0dc7d3fed744ea9bf695a497845a7297e1ca (diff) | |
| parent | d9614163ed327fc17d27ac623dfd639ce00a43ce (diff) | |
Merge branch 'feature/2842' of /home/git/repositories/micah/leap_platform into develop
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 |