summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-01-22 23:52:58 +0100
committervarac <varacanero@zeromail.org>2016-01-26 17:17:49 +0100
commit38e1003186ca194c75b87fdb8898304556d89a7a (patch)
tree5ed66fe5772d11ba351f2c60121fba8cd2d2b0cc /puppet/modules
parent5f7f7bd91c6d6c20305d97d8c2bfc03a78cdad69 (diff)
[bug] Use ruby::devel to install ruby-dev deb
Ruby itself is a parameterized class, and parameters cannot get overridden (see https://projects.puppetlabs.com/issues/9259). The webapp node didn't install the ruby-dev package (we never noticed because our vagrant images as probably other debian images had ruby-dev preinstalled). We now use the ruby::devel class to install ruby-dev. - Tested: [citest-jessie] - Resolves: #7838
Diffstat (limited to 'puppet/modules')
m---------puppet/modules/ruby0
-rw-r--r--puppet/modules/site_config/manifests/ruby/dev.pp8
2 files changed, 4 insertions, 4 deletions
diff --git a/puppet/modules/ruby b/puppet/modules/ruby
-Subproject 0fb2b398dbfce59c678d6f4044a55969e42c6d4
+Subproject 9ccd853c49af7d0b57ebd9c2ea7673b193fce24
diff --git a/puppet/modules/site_config/manifests/ruby/dev.pp b/puppet/modules/site_config/manifests/ruby/dev.pp
index e6eb2f8a..2b0b106d 100644
--- a/puppet/modules/site_config/manifests/ruby/dev.pp
+++ b/puppet/modules/site_config/manifests/ruby/dev.pp
@@ -1,8 +1,8 @@
# install ruby dev packages needed for building some gems
-class site_config::ruby::dev inherits site_config::ruby {
- Class['::ruby'] {
- install_dev => true
- }
+class site_config::ruby::dev {
+ include site_config::ruby
+ include ::ruby::devel
+
# building gems locally probably requires build-essential and gcc:
include site_config::packages::build_essential
}