summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Kluenter <ckluente@thoughtworks.com>2014-09-29 13:57:30 +0200
committerChristoph Kluenter <ckluente@thoughtworks.com>2014-09-29 13:57:30 +0200
commit63ca770b6913d674db639c486a8ba215ea0b7a65 (patch)
treeba7586fff6e307b3175921261d42101a45e572c6
parent1071c3622469b7b02dd3b772070db540b6842dfb (diff)
configure dhclient if its used in /e/network/interfaces
we don't dhclient to to set domain and search in /etc/reslov.conf bigcouch has a strange way to find its hostname. It uses the domain stanza in /etc/resolv.conf to find its domain
-rw-r--r--puppet/modules/site_config/manifests/default.pp5
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index fc2179de..42359a00 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -25,10 +25,7 @@ class site_config::default {
# i.e. openstack/aws nodes, vagrant nodes
# fix dhclient from changing resolver information
- if $::ec2_instance_id {
- include site_config::dhclient
- }
- if $::virtual == 'virtualbox' {
+ if $::dhcp_enabled == 'true' {
include site_config::dhclient
}