Merge "Update default server value to new puppet master"

This commit is contained in:
Jenkins 2014-09-23 21:14:26 +00:00 committed by Gerrit Code Review
commit 8210bd14f2

View File

@ -6,7 +6,7 @@ rundir=/var/run/puppet
<% if @puppet_version.to_f < 3.6 -%> <% if @puppet_version.to_f < 3.6 -%>
factpath=$vardir/lib/facter factpath=$vardir/lib/facter
templatedir=$confdir/templates templatedir=$confdir/templates
server=ci-puppetmaster.openstack.org server=puppetmaster.openstack.org
certname=<%= @certname %> certname=<%= @certname %>
pluginsync=true pluginsync=true
<% end %> <% end %>