From 0fb327d228aea2e703f11afb98dde3597860b479 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Tue, 22 Jul 2014 13:25:29 +0200
Subject: [PATCH] Debian and Ubuntu>Precise needs bundler package, not
 ruby-bundler

Under Debian and Ubuntu (Trusty release), ruby-bundler
package is just called bundler.
Trusty has a transitional package called ruby-bundler
but it should be better to stick to proper name.
Add a conditional to detect operating system and if it's
Precise install ruby-bundler package, it not install
bundler one.

Change-Id: Ib49f7947187f844effa49d0e7501ea37c86bde66
---
 modules/jenkins/manifests/params.pp                   | 10 +++++++++-
 modules/openstack_project/manifests/jenkins_params.pp | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp
index f7b64f6311..97b70a018e 100644
--- a/modules/jenkins/manifests/params.pp
+++ b/modules/jenkins/manifests/params.pp
@@ -55,7 +55,15 @@ class jenkins::params {
       $memcached_package = 'memcached'
       $ruby1_9_1_package = 'ruby1.9.1'
       $ruby1_9_1_dev_package = 'ruby1.9.1-dev'
-      $ruby_bundler_package = 'ruby-bundler'
+
+      # will install ruby-bundler for Ubuntu Precise
+      # and bundler for Debian or newer Ubuntu distros
+      if $::lsbdistcodename == 'precise' {
+        $ruby_bundler_package = 'ruby-bundler'
+      }
+      else {
+        $ruby_bundler_package = 'bundler'
+      }
       $php5_mcrypt_package = 'php5-mcrypt'
       # For [tooz, taskflow, nova] using zookeeper in unit tests
       $zookeeper_package = 'zookeeperd'
diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp
index d31b3e72e4..2bd32d9fc0 100644
--- a/modules/openstack_project/manifests/jenkins_params.pp
+++ b/modules/openstack_project/manifests/jenkins_params.pp
@@ -130,7 +130,15 @@ class openstack_project::jenkins_params {
       }
       $ruby1_9_1_package = 'ruby1.9.1'
       $ruby1_9_1_dev_package = 'ruby1.9.1-dev'
-      $ruby_bundler_package = 'ruby-bundler'
+
+      # will install ruby-bundler for Ubuntu Precise
+      # and bundler for Debian or newer Ubuntu distros
+      if ($::lsbdistcodename == 'precise') {
+        $ruby_bundler_package = 'ruby-bundler'
+      }
+      else {
+        $ruby_bundler_package = 'bundler'
+      }
       # Common Lisp interpreter, used for cl-openstack-client
       $sbcl_package = 'sbcl'
       $sqlite_package = 'sqlite3'