diff --git a/modules/openstack_project/files/puppetmaster/production_environment.conf b/modules/openstack_project/files/puppet/production_environment.conf
similarity index 100%
rename from modules/openstack_project/files/puppetmaster/production_environment.conf
rename to modules/openstack_project/files/puppet/production_environment.conf
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 18f1bed916..8436645a55 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -10,26 +10,6 @@ class openstack_project::puppetmaster (
   include logrotate
   include openstack_project::params
 
-  file {'/etc/puppet/environments':
-    ensure => directory,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0755',
-  }
-  file {'/etc/puppet/environments/production':
-    ensure => directory,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0755',
-  }
-  file {'/etc/puppet/environments/production/environment.conf':
-    ensure => file,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
-  }
-
   include ansible
 
   file { '/etc/ansible/hostfile':
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index b3c791842d..ef2887fc41 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -419,6 +419,26 @@ class openstack_project::template (
     source  => 'puppet:///modules/openstack_project/puppet/hiera.yaml',
     replace => true,
   }
+
+  file {'/etc/puppet/environments':
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
+  }
+  file {'/etc/puppet/environments/production':
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
+  }
+  file {'/etc/puppet/environments/production/environment.conf':
+    ensure => file,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0644',
+    source => 'puppet:///modules/openstack_project/puppet/production_environment.conf',
+  }
   ###########################################################
 
 }
diff --git a/modules/openstack_project/templates/puppet.conf.erb b/modules/openstack_project/templates/puppet.conf.erb
index 01954bb60b..4c52a8d2ad 100644
--- a/modules/openstack_project/templates/puppet.conf.erb
+++ b/modules/openstack_project/templates/puppet.conf.erb
@@ -3,20 +3,16 @@ logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
-server=<%= @puppetmaster_server %>
-certname=<%= @certname.downcase %>
-pluginsync=true
+basemodulepath=/etc/puppet/modules
+environmentpath = /etc/puppet/environments
 data_binding_terminus = none
 
-
 [master]
 # These are needed when the puppetmaster is run by passenger
 # and can safely be removed if webrick is used.
 ssl_client_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
 reports=store,puppetdb
-basemodulepath = /etc/puppet/modules
-environmentpath = /etc/puppet/environments
 environmenttimeout = 0
 <% if @ca_server -%>
 ca = false
@@ -27,3 +23,9 @@ ca_server = <%= @ca_server %>
 report=true
 splay=true
 runinterval=600
+server=<%= @puppetmaster_server %>
+certname=<%= @certname.downcase %>
+pluginsync=true
+
+[user]
+reports=puppetdb_file