From 452c978b43da45a922f53e242ce31bdfd14337c0 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 3 Jul 2014 11:02:28 -0700
Subject: [PATCH] Put the trusty test in the Ubuntu section

Turns out trusty is not a RedHat release.

Change-Id: Ife10c2c2cc83fc83a8f02a7f43fca26c16da2b1b
---
 .../openstack_project/manifests/jenkins_params.pp    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp
index 0500179354..150a0ba03e 100644
--- a/modules/openstack_project/manifests/jenkins_params.pp
+++ b/modules/openstack_project/manifests/jenkins_params.pp
@@ -47,11 +47,7 @@ class openstack_project::jenkins_params {
       $python_magic_package = 'python-magic'
       $python_requests_package = 'python-requests'
       $python_zmq_package = 'python-zmq'
-      if ($::lsbdistcodename) == 'trusty' {
-        $rubygems_package = 'ruby'
-      } else {
-        $rubygems_package = 'rubygems'
-      }
+      $rubygems_package = 'rubygems'
       # Common Lisp interpreter, used for cl-openstack-client
       $sbcl_package = 'sbcl'
       $sqlite_package = 'sqlite'
@@ -129,7 +125,11 @@ class openstack_project::jenkins_params {
       $python_magic_package = 'python-magic'
       $python_requests_package = 'python-requests'
       $python_zmq_package = 'python-zmq'
-      $rubygems_package = 'rubygems'
+      if ($::lsbdistcodename) == 'trusty' {
+        $rubygems_package = 'ruby'
+      } else {
+        $rubygems_package = 'rubygems'
+      }
       $ruby1_9_1_package = 'ruby1.9.1'
       $ruby1_9_1_dev_package = 'ruby1.9.1-dev'
       $ruby_bundler_package = 'ruby-bundler'