opendev/system-config
Code Issues Proposed changes

Debian and Ubuntu>Precise needs bundler package, not ruby-bundler

Browse Source 
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
This commit is contained in:
Yolanda Robla 2014-07-22 13:25:29 +02:00
parent fb1403c4f0
commit 0fb327d228
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/jenkins/manifests/params.pp
View File

@ -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'

10
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -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'