summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-03-26 13:37:29 +0100
committervarac <varacanero@zeromail.org>2014-03-26 13:37:29 +0100
commitf3deb7db2648080bbe74dd4de9c7a45caadaff80 (patch)
tree07cd2ba995e2e126b6aef4ea5c9911b4a77318f8 /puppet/modules/site_config
parent1b0dcc36541e4e5b47d3e7f8f31959c4f458343a (diff)
parentc946f47448e0b902d227492c33c5f56998a82875 (diff)
Merge branch '5018_dont_remove_dev_packages_on_couch_node' into 0.6
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/packages/base.pp8
1 files changed, 5 insertions, 3 deletions
diff --git a/puppet/modules/site_config/manifests/packages/base.pp b/puppet/modules/site_config/manifests/packages/base.pp
index 9d416043..9f802771 100644
--- a/puppet/modules/site_config/manifests/packages/base.pp
+++ b/puppet/modules/site_config/manifests/packages/base.pp
@@ -17,10 +17,12 @@ class site_config::packages::base {
ensure => absent;
}
- if $::site_config::params::environment == 'local' or $::services =~ /\bwebapp\b/ {
- $dev_packages_ensure = present
+ if $::site_config::params::environment == 'local'
+ or $::services =~ /\bwebapp\b/
+ or $::services =~ /\bcouchdb\b/ {
+ $dev_packages_ensure = present
} else {
- $dev_packages_ensure = absent
+ $dev_packages_ensure = absent
}
# g++ and ruby1.9.1-dev are needed for nickserver/eventmachine (#4079)