diff options
| author | varac <varacanero@zeromail.org> | 2013-09-17 18:37:00 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-17 18:51:55 +0200 |
| commit | 5ca8f6f9d26a2c2abfa9f1752aad6b8d91020074 (patch) | |
| tree | 7b8da54b54b42c943cf132fb4a020654b419fd15 /puppet/modules/site_config/manifests/default.pp | |
| parent | ecb3727ad43ee55f07db067e80b9d74308296582 (diff) | |
shorewall: #2399 blocks uplink (Bug #2866)
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index b315044a..83a344a2 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -15,11 +15,18 @@ class site_config::default { # configure ssh and include ssh-keys include site_config::sshd + # include classes for special environments + # i.e. openstack/aws nodes, vagrant nodes + # fix dhclient from changing resolver information if $::ec2_instance_id { include site_config::dhclient } + if ( $::virtual == 'virtualbox' ) { + include site_config::vagrant + } + # configure /etc/resolv.conf include site_config::resolvconf |