opendev/system-config
Code Issues Proposed changes

Merge "Add support for Ubuntu Xenial"

Browse Source
This commit is contained in:
Jenkins 2016-03-29 08:03:35 +00:00 committed by Gerrit Code Review
commit c9f8a7a956
3 changed files with 16 additions and 8 deletions
install_puppet.sh
modules/openstack_project/manifests
jenkins_params.pptemplate.pp

12
install_puppet.sh

@ -187,10 +187,14 @@ Pin: version $FACTER_VERSION
Pin-Priority: 501 Pin-Priority: 501
EOF EOF
puppet_deb=puppetlabs-release-${lsbdistcodename}.deb # NOTE(pabelanger): Puppetlabs does not support ubuntu xenial. Instead use
wget http://apt.puppetlabs.com/$puppet_deb -O $puppet_deb # the version of puppet ship by xenial.
dpkg -i $puppet_deb if [ $lsbdistcodename != 'xenial']; then
rm $puppet_deb puppet_deb=puppetlabs-release-${lsbdistcodename}.deb
wget http://apt.puppetlabs.com/$puppet_deb -O $puppet_deb
dpkg -i $puppet_deb
rm $puppet_deb
fi;
apt-get update apt-get update
DEBIAN_FRONTEND=noninteractive apt-get --option 'Dpkg::Options::=--force-confold' \ DEBIAN_FRONTEND=noninteractive apt-get --option 'Dpkg::Options::=--force-confold' \

6
modules/openstack_project/manifests/jenkins_params.pp

@ -126,7 +126,11 @@ class openstack_project::jenkins_params {
$libxml2_dev_package = 'libxml2-dev' $libxml2_dev_package = 'libxml2-dev'
$libxslt_dev_package = 'libxslt1-dev' $libxslt_dev_package = 'libxslt1-dev'
$libffi_dev_package = 'libffi-dev' $libffi_dev_package = 'libffi-dev'
$maven_package = 'maven2' if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
$maven_package = 'maven'
} else {
$maven_package = 'maven2'
}
# For tooz unit tests # For tooz unit tests
$memcached_package = 'memcached' $memcached_package = 'memcached'
# For tooz unit tests (and others that use redis) # For tooz unit tests (and others that use redis)

6
modules/openstack_project/manifests/template.pp

@ -321,9 +321,9 @@ class openstack_project::template (
# Which Puppet do I take? # Which Puppet do I take?
# Take $puppet_version and pin to that version # Take $puppet_version and pin to that version
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {
# Note(JR): Puppetlabs does not support Ubuntu Vivid currently, but it # NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
# also seems that distro packages are recent enough # anything greater will use the OS version of puppet.
if ($::operatingsystemrelease != '15.04') { if ($::operatingsystemrelease < '15.04') {
apt::source { 'puppetlabs': apt::source { 'puppetlabs':
location => 'http://apt.puppetlabs.com', location => 'http://apt.puppetlabs.com',
repos => 'main', repos => 'main',