From 38e1003186ca194c75b87fdb8898304556d89a7a Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 22 Jan 2016 23:52:58 +0100 Subject: [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 --- puppet/modules/ruby | 2 +- puppet/modules/site_config/manifests/ruby/dev.pp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'puppet') diff --git a/puppet/modules/ruby b/puppet/modules/ruby index 0fb2b398..9ccd853c 160000 --- a/puppet/modules/ruby +++ b/puppet/modules/ruby @@ -1 +1 @@ -Subproject commit 0fb2b398dbfce59c678d6f4044a55969e42c6d4d +Subproject commit 9ccd853c49af7d0b57ebd9c2ea7673b193fce24b 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 } -- cgit v1.2.3