summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-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
}