From 05531f7978215b3c65ba5d1e45caf69c36ac4dbf Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 15 Sep 2014 18:04:04 +0000
Subject: [PATCH] Update default server value to new puppet master

Now that we've finished moving all puppet agents to get triggered
from the new master, update their configuration to assume the new
server is the default so that we no longer need to override it when
running locally from the command line.

Change-Id: I446341c5115d948bb8dedbe00e23b38b3e78c62f
---
 modules/openstack_project/templates/puppet.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openstack_project/templates/puppet.conf.erb b/modules/openstack_project/templates/puppet.conf.erb
index af73e2c55a..c4678a0094 100644
--- a/modules/openstack_project/templates/puppet.conf.erb
+++ b/modules/openstack_project/templates/puppet.conf.erb
@@ -6,7 +6,7 @@ rundir=/var/run/puppet
 <% if @puppet_version.to_f < 3.6 -%>
 factpath=$vardir/lib/facter
 templatedir=$confdir/templates
-server=ci-puppetmaster.openstack.org
+server=puppetmaster.openstack.org
 certname=<%= @certname %>
 pluginsync=true
 <% end %>