Avoid duplicate declaration issues when server_additonal_settings and…

… additional_settings contain same key Remove use of puppet::config::additional_settings in favor of each() block
theforeman · Oct 17, 2017 · 8963eee · 8963eee
1 parent 45b46ca
commit 8963eee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
@@ -36,12 +36,8 @@
     }
   }
 
-  # we need to store this in a variable, because older puppet doesn't
-  # like resource{function(): ... }
-  $additional_settings_keys = keys($::puppet::agent_additional_settings)
-  puppet::config::additional_settings{ $additional_settings_keys:
-    hash     => $::puppet::agent_additional_settings,
-    resource => '::puppet::config::agent',
+  $::puppet::agent_additional_settings.each |$key,$value| {
+    puppet::config::agent { $key: value => $value }
   }
 
   if $::puppet::runmode == 'service' {

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -63,12 +63,8 @@
     puppet::config::main{'syslogfacility': value => $syslogfacility; }
   }
 
-  # we need to store this in a variable, because older puppet doesn't
-  # like resource{function(): ... }
-  $additional_settings_keys = keys($additional_settings)
-  puppet::config::additional_settings{ $additional_settings_keys:
-    hash     => $additional_settings,
-    resource => '::puppet::config::main',
+  $additional_settings.each |$key,$value| {
+    puppet::config::main { $key: value => $value }
   }
 
   file { $puppet_dir:

diff --git a/manifests/config/additional_settings.pp b/manifests/config/additional_settings.pp
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -114,12 +114,8 @@
     }
   }
 
-  # we need to store this in a variable, because older puppet doesn't
-  # like resource{function(): ... }
-  $additional_settings_keys = keys($::puppet::server_additional_settings)
-  puppet::config::additional_settings{ $additional_settings_keys:
-    hash     => $::puppet::server_additional_settings,
-    resource => '::puppet::config::master',
+  $::puppet::server_additional_settings.each |$key,$value| {
+    puppet::config::master { $key: value => $value }
   }
 
   file { "${puppet::vardir}/reports":