opendev/system-config
Code Issues Proposed changes

Merge "Pin puppetdb to 2.x"

Browse Source
This commit is contained in:
Jenkins 2014-09-15 17:16:00 +00:00 committed by Gerrit Code Review
commit c2458d305b
4 changed files with 9 additions and 9 deletions
install_puppet.sh
modules/openstack_project
files
centos-puppetlabs.repo
manifests
base.pp
templates
00-puppet.pref.erb

8
install_puppet.sh

@ -139,11 +139,11 @@ function setup_puppet_ubuntu {
# NB: keep in sync with openstack_project/files/00-puppet.pref
if [ "$THREE" == 'yes' ]; then
PUPPET_VERSION=3.*
PUPPETDB_TERMINUS_VERSION=2.*
PUPPETDB_VERSION=2.*
FACTER_VERSION=2.*
else
PUPPET_VERSION=2.7*
PUPPETDB_TERMINUS_VERSION=1.*
PUPPETDB_VERSION=1.*
FACTER_VERSION=1.*
fi
@ -152,8 +152,8 @@ Package: puppet puppet-common puppetmaster puppetmaster-common puppetmaster-pass
Pin: version $PUPPET_VERSION
Pin-Priority: 501
Package: puppetdb-terminus
Pin: version $PUPPETDB_TERMINUS_VERSION
Package: puppetdb puppetdb-terminus
Pin: version $PUPPETDB_VERSION
Pin-Priority: 501
Package: facter

2
modules/openstack_project/files/centos-puppetlabs.repo

@ -4,4 +4,4 @@ baseurl=http://yum.puppetlabs.com/el/6/products/$basearch
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs
enabled=1
gpgcheck=1
exclude=puppet-4* facter-3* puppetdb-terminus-3*
exclude=puppet-4* facter-3* puppetdb-3* puppetdb-terminus-3*

4
modules/openstack_project/manifests/base.pp

@ -16,11 +16,11 @@ class openstack_project::base(
case $pin_puppet {
'2.7.': {
$pin_facter = '1.'
$pin_puppetdb_terminus = '1.'
$pin_puppetdb = '1.'
}
/^3\./: {
$pin_facter = '2.'
$pin_puppetdb_terminus = '2.'
$pin_puppetdb = '2.'
}
default: {
fail("Puppet version not supported")

4
modules/openstack_project/templates/00-puppet.pref.erb

@ -2,8 +2,8 @@ Package: puppet puppet-common puppetmaster puppetmaster-common puppetmaster-pass
Pin: version <%= @pin_puppet %>*
Pin-Priority: 501
Package: puppetdb-terminus
Pin: version <%= @pin_puppetdb_terminus %>*
Package: puppetdb puppetdb-terminus
Pin: version <%= @pin_puppetdb %>*
Pin-Priority: 501
Package: facter