diff --git a/modules/openstack_project/files/puppetmaster/production_environment.conf b/modules/openstack_project/files/puppetmaster/production_environment.conf
new file mode 100644
index 0000000000..dd49ca1dfc
--- /dev/null
+++ b/modules/openstack_project/files/puppetmaster/production_environment.conf
@@ -0,0 +1,2 @@
+manifest = /opt/config/production/manifests/site.pp
+modulepath = $basemodulepath:modules:/opt/config/production/modules
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 137ddd355d..f62167c29b 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -23,6 +23,26 @@ class openstack_project::puppetmaster (
   }
   else {
     $ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet3.yaml'
+
+    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',
+    }
   }
 
   class { 'ansible':