ugh, custom function

lib/puppet/parser/functions/merge_hashes.rb

@@ -0,0 +1,18 @@
+require 'deep_merge'
+
+module Puppet::Parser::Functions
+  newfunction(:merge_hashes, :type => :rvalue, :doc => "Performs a deep merge on multiple hashes passed in as arguments.") do |args|
+    begin
+      merged = {}
+
+      args.each do |arg|
+        merged.deep_merge!(arg, { :merge_hash_arrays => true })
+      end
+
+      merged
+
+    rescue StandardError => e
+      raise Puppet::ParseError, e.message
+    end
+  end
+end

manifests/tomcat.pp

@@ -35,8 +35,10 @@
   }
 
   # Postgres
-  $postgres = lookup('rk_tomcat::tomcat::postgres', { 'merge' => { 'strategy' => 'deep', 'merge_hash_arrays' => true }, 'value_type' => Hash })
-  $postgres_resources = $postgres.map |$key,$values| {
+  $postgres = lookup('rk_tomcat::tomcat::postgres', { 'value_type' => Hash })
+  $postgres_secrets = lookup('rk_tomcat::tomcat::postgres_secrets', { 'value_type' => Hash })
+  $postgres_merged = merge_hashes($postgres, $postgres_secrets)
+  $postgres_resources = $postgres_merged.map |$key,$values| {
     {
       'name'      => $values[name],
       'url'       => "jdbc:postgresql://${values[host]}:${values[port]}/${values[db]}",
@@ -47,7 +49,7 @@
     }
   }
 
-  notify { "postgres: $postgres": }
+  notify { "postgres: $postgres_merged": }
 
   # Logentries
   $logentries_analytics_token = $logentries_tokens['analytics']