From da3d3f58b2809e5cf6cca51ad1869b5f2f7add0e Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@cat.pdx.edu>
Date: Tue, 25 Nov 2014 16:21:03 -0800
Subject: [PATCH] Remove logic from puppet.conf

We can now use 3.x configuration exclusively. Also we used
$puppet_version which is incorrect, the value is $puppetversion.

Change-Id: I8ddd985d76970ab8937752dd9c2dc6cf4b7d160a
---
 modules/openstack_project/templates/puppet.conf.erb | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/openstack_project/templates/puppet.conf.erb b/modules/openstack_project/templates/puppet.conf.erb
index f9f3e07e69..c5c5024066 100644
--- a/modules/openstack_project/templates/puppet.conf.erb
+++ b/modules/openstack_project/templates/puppet.conf.erb
@@ -3,18 +3,12 @@ logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
-<% if @puppet_version.to_f < 3.6 -%>
-factpath=$vardir/lib/facter
-templatedir=$confdir/templates
 server=puppetmaster.openstack.org
 certname=<%= @certname %>
 pluginsync=true
-<% end %>
-<% if @puppet_version.to_f >= 3.6 -%>
 basemodulepath = /etc/puppet/modules
 environmentpath = /etc/puppet/environments
 environmenttimeout = 0
-<% end %>
 
 
 [master]
@@ -22,11 +16,6 @@ environmenttimeout = 0
 # and can safely be removed if webrick is used.
 ssl_client_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
-<% if @puppet_version.to_f < 3.6 -%>
-manifestdir=/opt/system-config/$environment/manifests
-modulepath=/opt/system-config/$environment/modules:/etc/puppet/modules
-manifest=$manifestdir/site.pp
-<% end -%>
 reports=store,puppetdb
 <% if @ca_server -%>
 ca = false