summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-01-22 17:05:26 +0100
committervarac <varacanero@zeromail.org>2016-01-22 17:08:32 +0100
commit69d2549a8b3b670b10d0efe079bcbc4ba066907d (patch)
tree3fa29cbc72344a56aba5f70d20880dbae72bdbb6 /puppet/modules/site_config/manifests/default.pp
parentf5ecaaa1bd7412fc152b41e4cc522cd0dc43cc37 (diff)
[bug] refactor build-essential package installation
In certain node setups, the webapp gems cannot get built because `build-essential` and dependent packages were not present. I refactored the `site_config::packages::build_essential` class, which now inherits `site_config::packages`. The latter class removes all unneccessary (development) packages, but when the `site_config::packages::build_essential` class is included, some dev packages are overridden to be installed. - Tested: [local] - Resolves: #7834
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r--puppet/modules/site_config/manifests/default.pp6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 4e297026..7a2a0a79 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -10,7 +10,6 @@ class site_config::default {
# make sure apt is updated before any packages are installed
include apt::update
Package { require => Exec['apt_updated'] }
- include site_config::packages::uninstall
include site_config::slow
@@ -28,7 +27,10 @@ class site_config::default {
# i.e. openstack/aws nodes, vagrant nodes
# fix dhclient from changing resolver information
+ # facter returns 'true' as string
+ # lint:ignore:quoted_booleans
if $::dhcp_enabled == 'true' {
+ # lint:endignore
include site_config::dhclient
}
@@ -45,7 +47,7 @@ class site_config::default {
include haveged
# install/remove base packages
- include site_config::packages::base
+ include site_config::packages
# include basic shorewall config
include site_shorewall::defaults