diff --git a/modules/openstack_project/files/puppetmaster/hiera.yaml b/modules/openstack_project/files/puppet/hiera.yaml
similarity index 100%
rename from modules/openstack_project/files/puppetmaster/hiera.yaml
rename to modules/openstack_project/files/puppet/hiera.yaml
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index bdfbcd1ad1..38307905c3 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -69,16 +69,6 @@ class openstack_project::puppetmaster (
     environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin',
   }
 
-  file { '/etc/puppet/hiera.yaml':
-    ensure  => present,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0555',
-    source  => 'puppet:///modules/openstack_project/puppetmaster/hiera.yaml',
-    replace => true,
-    require => Class['openstack_project::server'],
-  }
-
   file { '/var/lib/puppet/reports':
     ensure => directory,
     owner  => 'puppet',
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 929e3a2dce..b23c92dac1 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -405,6 +405,15 @@ class openstack_project::template (
   service { 'puppet':
     ensure => stopped,
   }
+
+  file { '/etc/puppet/hiera.yaml':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0555',
+    source  => 'puppet:///modules/openstack_project/puppet/hiera.yaml',
+    replace => true,
+  }
   ###########################################################
 
 }