From 508b9cc6007d508b1c30a7cea1232c48cac3f133 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Wed, 6 Jan 2016 15:19:06 -0800
Subject: [PATCH] Move hiera_config to main section of puppet.conf

If it is in master instead of main then puppet apply will give a
warning.
---
 site/profile/manifests/puppetmaster.pp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index d73236f..8a1b161 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -15,9 +15,18 @@ class profile::puppetmaster {
     notify     => Service['pe-puppetserver'],
   }
 
-  ini_setting { 'puppet.conf hiera_config' :
+  ini_setting { 'puppet.conf hiera_config main section' :
     ensure  => present,
     path    => "${::settings::confdir}/puppet.conf",
+    section => 'main',
+    setting => 'hiera_config',
+    value   => $hiera_yaml,
+    notify  => Service['pe-puppetserver'],
+  }
+
+  ini_setting { 'puppet.conf hiera_config master section' :
+    ensure  => absent,
+    path    => "${::settings::confdir}/puppet.conf",
     section => 'master',
     setting => 'hiera_config',
     value   => $hiera_yaml,