From 51fcec1a47ed9d2f064355e2de078876bc1693f5 Mon Sep 17 00:00:00 2001
From: Spencer Krum <spencer.krum@hp.com>
Date: Thu, 31 Jul 2014 14:25:23 -0700
Subject: [PATCH] Pinning puppetdb-terminus with other puppet packages

Change-Id: I5025167cc60147258039ac188829337e7907ad0d
---
 install_puppet.sh                                      | 2 +-
 modules/openstack_project/templates/00-puppet.pref.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_puppet.sh b/install_puppet.sh
index ee0031ea0a..ac5506dd00 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -150,7 +150,7 @@ function setup_puppet_ubuntu {
     fi
 
     cat > /etc/apt/preferences.d/00-puppet.pref <<EOF
-Package: puppet puppet-common puppetmaster puppetmaster-common puppetmaster-passenger
+Package: puppet puppet-common puppetmaster puppetmaster-common puppetmaster-passenger puppetdb-terminus
 Pin: version $PUPPET_VERSION
 Pin-Priority: 501
 
diff --git a/modules/openstack_project/templates/00-puppet.pref.erb b/modules/openstack_project/templates/00-puppet.pref.erb
index 11c08f6a6b..abf45412f6 100644
--- a/modules/openstack_project/templates/00-puppet.pref.erb
+++ b/modules/openstack_project/templates/00-puppet.pref.erb
@@ -1,4 +1,4 @@
-Package: puppet puppet-common puppetmaster puppetmaster-common puppetmaster-passenger
+Package: puppet puppet-common puppetmaster puppetmaster-common puppetmaster-passenger puppetdb-terminus
 Pin: version <%= @pin_puppet %>*
 Pin-Priority: 501