Merge branch 'feature/4079_dont_remove_build_packages' into develop

2 files changed, 15 insertions, 6 deletions

diff --git a/puppet/modules/site_config/manifests/packages/base.pp b/puppet/modules/site_config/manifests/packages/base.pp
index d93e194b..94ff679b 100644
--- a/puppet/modules/site_config/manifests/packages/base.pp
+++ b/puppet/modules/site_config/manifests/packages/base.pp
@@ -6,7 +6,7 @@ class site_config::packages::base {
   }
 
   # base set of packages that we want to remove everywhere
-  package { [ 'acpi', 'acpid', 'acpi-support-base',  'eject', 'ftp',
+  package { [ 'acpi', 'acpid', 'acpi-support-base',  'eject', 'ftp', 'fontconfig-config',
               'laptop-detect', 'lpr', 'nfs-common', 'nfs-kernel-server',
               'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat', 'rpcbind',
               'samba-common', 'samba-common-bin', 'smbclient', 'tcl8.5',
@@ -15,14 +15,17 @@ class site_config::packages::base {
     ensure => absent;
   }
 
-  if $::virtual == 'virtualbox' {
-    $virtualbox_ensure = present
+  if $::virtual == 'virtualbox' or $::services =~ /\bwebapp\b/ {
+    $dev_packages_ensure = present
   } else {
-    $virtualbox_ensure = absent
+    $dev_packages_ensure = absent
   }
 
-  package { [ 'build-essential', 'fontconfig-config', 'g++', 'g++-4.7', 'gcc',
+  # g++ and ruby1.9.1-dev are needed for nickserver/eventmachine (#4079)
+  # dev_packages are needed for building gems on the webapp node
+
+  package { [ 'build-essential', 'g++', 'g++-4.7', 'gcc',
               'gcc-4.6', 'gcc-4.7', 'cpp', 'cpp-4.6', 'cpp-4.7', 'libc6-dev' ]:
-                ensure => $virtualbox_ensure
+    ensure => $dev_packages_ensure
   }
 }
diff --git a/puppet/modules/site_config/manifests/ruby/dev.pp b/puppet/modules/site_config/manifests/ruby/dev.pp
new file mode 100644
index 00000000..dbc77ae7
--- /dev/null
+++ b/puppet/modules/site_config/manifests/ruby/dev.pp
@@ -0,0 +1,6 @@
+class site_config::ruby::dev inherits site_config::ruby {
+  Class['::ruby'] {
+    ruby_version => '1.9.3',
+    install_dev  => true
+  }
+}