diff options
| author | Christoph <chris@inferno.nadir.org> | 2014-05-20 11:42:26 +0200 |
|---|---|---|
| committer | Christoph <chris@inferno.nadir.org> | 2014-05-21 09:14:39 +0200 |
| commit | ba13b08cd06010dd8cd172d0e3b5b296f9981edf (patch) | |
| tree | 334cc0b35cc5a94ddabc7252589be5cf4cb9900a /puppet/modules/site_config/manifests | |
| parent | 0755757cd57679a946631411163eb61010215cb5 (diff) | |
fix resolv.conf on virtualbox
virtualbox sends the domain with the dhcp-answer.
If the wrong domain ends up in /etc/resolv.conf bigcouch fails.
Diffstat (limited to 'puppet/modules/site_config/manifests')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index 7e421a21..c7352857 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -27,6 +27,9 @@ class site_config::default { if $::ec2_instance_id { include site_config::dhclient } + if $::virtual == 'virtualbox' { + include site_config::dhclient + } # configure /etc/resolv.conf include site_config::resolvconf |