From 4251332e97a70ba6b23e2a9dac5c134f6bd0cb64 Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Mon, 16 Mar 2015 14:10:39 -0700
Subject: [PATCH] Manage hiera.yaml on all hosts

When puppet apply runs on a host, it will need a hiera.yaml to inform
lookups with. Manage that in base.pp.

Change-Id: I61603bf2f8e1c11640c744a20377790cd217356d
---
 .../files/{puppetmaster => puppet}/hiera.yaml          |  0
 modules/openstack_project/manifests/puppetmaster.pp    | 10 ----------
 modules/openstack_project/manifests/template.pp        |  9 +++++++++
 3 files changed, 9 insertions(+), 10 deletions(-)
 rename modules/openstack_project/files/{puppetmaster => puppet}/hiera.yaml (100%)

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,
+  }
   ###########################################################
 
 }