opendev/system-config
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2014-08-16 01:33:00 +00:00 committed by Gerrit Code Review
commit 181681626e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,15 @@ class jenkins::params {
$memcached_package = 'memcached' $memcached_package = 'memcached'
$ruby1_9_1_package = 'ruby1.9.1' $ruby1_9_1_package = 'ruby1.9.1'
$ruby1_9_1_dev_package = 'ruby1.9.1-dev' $ruby1_9_1_dev_package = 'ruby1.9.1-dev'
# will install ruby-bundler for Ubuntu Precise
# and bundler for Debian or newer Ubuntu distros
if $::lsbdistcodename == 'precise' {
$ruby_bundler_package = 'ruby-bundler' $ruby_bundler_package = 'ruby-bundler'
}
else {
$ruby_bundler_package = 'bundler'
}
$php5_mcrypt_package = 'php5-mcrypt' $php5_mcrypt_package = 'php5-mcrypt'
# For [tooz, taskflow, nova] using zookeeper in unit tests # For [tooz, taskflow, nova] using zookeeper in unit tests
$zookeeper_package = 'zookeeperd' $zookeeper_package = 'zookeeperd'

8
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_package = 'ruby1.9.1'
$ruby1_9_1_dev_package = 'ruby1.9.1-dev' $ruby1_9_1_dev_package = 'ruby1.9.1-dev'
# will install ruby-bundler for Ubuntu Precise
# and bundler for Debian or newer Ubuntu distros
if ($::lsbdistcodename == 'precise') {
$ruby_bundler_package = 'ruby-bundler' $ruby_bundler_package = 'ruby-bundler'
}
else {
$ruby_bundler_package = 'bundler'
}
# Common Lisp interpreter, used for cl-openstack-client # Common Lisp interpreter, used for cl-openstack-client
$sbcl_package = 'sbcl' $sbcl_package = 'sbcl'
$sqlite_package = 'sqlite3' $sqlite_package = 'sqlite3'