From fcd1a57d30c8b27119cb8e4c077db70df9810500 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sun, 14 Sep 2014 16:27:07 +0000
Subject: [PATCH] Pin puppetdb to 2.x

As we discovered in the course of upgrading puppetboard the puppetdb
package is upgraded independently of the puppetdb-terminus package,
but in fact it will break if they don't match. We now pin them to
the same values for safety.

Change-Id: I628129997e084ec5e4cb18947fa7e2362c9b4ba5
---
 install_puppet.sh                                      | 8 ++++----
 modules/openstack_project/files/centos-puppetlabs.repo | 2 +-
 modules/openstack_project/manifests/base.pp            | 4 ++--
 modules/openstack_project/templates/00-puppet.pref.erb | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/install_puppet.sh b/install_puppet.sh
index 30dacd62be..a9389294a9 100755
--- a/install_puppet.sh
+++ b/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
diff --git a/modules/openstack_project/files/centos-puppetlabs.repo b/modules/openstack_project/files/centos-puppetlabs.repo
index f35c1d3e2c..824786a74c 100644
--- a/modules/openstack_project/files/centos-puppetlabs.repo
+++ b/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*
diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index d34c862df1..5f013042bf 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/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")
diff --git a/modules/openstack_project/templates/00-puppet.pref.erb b/modules/openstack_project/templates/00-puppet.pref.erb
index e07ef0c858..759c84f45f 100644
--- a/modules/openstack_project/templates/00-puppet.pref.erb
+++ b/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