diff --git a/modules/openstack_project/files/puppetmaster/hiera.yaml b/modules/openstack_project/files/puppetmaster/hiera.yaml
new file mode 100644
index 0000000000..8e930ba95c
--- /dev/null
+++ b/modules/openstack_project/files/puppetmaster/hiera.yaml
@@ -0,0 +1,8 @@
+---
+:hierarchy:
+  - %{operatingsystem}
+  - common
+:backends:
+  - yaml
+:yaml:
+  :datadir: '/etc/puppet/hieradata/%{environment}'
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 444e094fb5..ee48ee15ae 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -8,4 +8,14 @@ class openstack_project::puppetmaster {
     command => 'sleep $((RANDOM\%600)) && cd /opt/openstack-ci-puppet/production && /usr/bin/git pull -q && /bin/bash install_modules.sh',
     environment => "PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin",
   }
+
+  file { '/etc/puppet/hiera.yaml':
+    owner => 'root',
+    group => 'root',
+    mode => 555,
+    ensure => 'present',
+    source => 'puppet:///modules/openstack_project/puppetmaster/hiera.yaml',
+    replace => 'true',
+    require => Class['openstack_project::server']
+  }
 }