From 9dcbfe6fbba74d5f101927fcd8a5dac6eab79deb Mon Sep 17 00:00:00 2001
From: Spencer Krum <spencer.krum@hp.com>
Date: Tue, 2 Sep 2014 15:42:18 -0700
Subject: [PATCH] Updating node defn for puppet 3 master

This updates puppet version to 3.6

Change-Id: I37879153c68011c752919675a2d3416383aaf8e5
---
 manifests/site.pp              | 2 +-
 util/puppetmaster_bootstrap.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index a6df9bae71..0c48fc4d91 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -185,7 +185,7 @@ node 'puppetmaster.openstack.org' {
     root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'),
     update_slave => false,
     sysadmins    => hiera('sysadmins', []),
-    version      => '3.4.',
+    version      => '3.6.',
     ca_server    => 'ci-puppetmaster.openstack.org',
   }
 }
diff --git a/util/puppetmaster_bootstrap.sh b/util/puppetmaster_bootstrap.sh
index ec4e194183..f9d9d36907 100755
--- a/util/puppetmaster_bootstrap.sh
+++ b/util/puppetmaster_bootstrap.sh
@@ -2,6 +2,7 @@
 set -x
 
 # Script to build a puppet 3 master to infra/config standards
+
 apt-get update
 apt-get install git
 git clone https://git.openstack.org/openstack-infra/config