From 44df938f18634039d3278267f314c139e743885f Mon Sep 17 00:00:00 2001
From: Michael Smith <michael.smith@puppetlabs.com>
Date: Thu, 16 Jul 2015 10:13:19 -0700
Subject: [PATCH] (PUP-4886) Clear settings at global level

Without this change, settings at the global level in puppet.conf
(outside a section) would not be cleared, and get inheritted by each
section. This would lead to incorrect configurations.

Also clear settings at the global level.
---
 manifests/prepare/puppet_config.pp        | 2 +-
 spec/classes/puppet_agent_prepare_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/prepare/puppet_config.pp b/manifests/prepare/puppet_config.pp
index 0745d19b5..b008a159a 100644
--- a/manifests/prepare/puppet_config.pp
+++ b/manifests/prepare/puppet_config.pp
@@ -12,7 +12,7 @@
   }
 
 # manage puppet.conf contents, using inifile module
-  ['master', 'agent', 'main'].each |$loop_section| {
+  ['', 'master', 'agent', 'main'].each |$loop_section| {
     $section = $loop_section
     [# Removed settings
       'allow_variables_with_dashes', 'async_storeconfigs', 'binder', 'catalog_format', 'certdnsnames',
diff --git a/spec/classes/puppet_agent_prepare_spec.rb b/spec/classes/puppet_agent_prepare_spec.rb
index 55278a03a..eddd8839c 100644
--- a/spec/classes/puppet_agent_prepare_spec.rb
+++ b/spec/classes/puppet_agent_prepare_spec.rb
@@ -134,7 +134,7 @@
           'backup' => 'false',
         }) }
 
-        ['agent', 'main', 'master'].each do |section|
+        ['', 'agent', 'main', 'master'].each do |section|
           ['allow_variables_with_dashes',
            'async_storeconfigs',
            'binder',