Merge branch 'develop' into neoloc/syd1_puppetdb

2024-05-22 22:11:04 +10:00
parent e9c7fbc2b5 4b0ff2deee
commit f6bf504416
77 changed files with 1230 additions and 668 deletions
@@ -87,9 +87,21 @@ lookup_options:
  profiles::consul::client::node_rules:
    merge:
      strategy: deep
+  profiles::consul::prepared_query::rules:
+    merge:
+      strategy: deep
  profiles::puppet::server::dns_alt_names:
    merge:
      strategy: deep
+  profiles::base::hosts::additional_hosts:
+    merge:
+      strategy: deep
+  postgresql_config_entries:
+    merge:
+      strategy: deep
+  profiles::yum::global::repos:
+    merge:
+      strategy: deep

 facts_path: '/opt/puppetlabs/facter/facts.d'