Merge branch 'develop' into neoloc/consul_wan

Conflicts: hieradata/common.yaml
2024-05-05 18:01:41 +10:00
parent 8a241d6b96 31f670ad18
commit 14a56a41a2
21 changed files with 271 additions and 218 deletions
@@ -90,6 +90,9 @@ lookup_options:
  profiles::consul::prepared_query::rules:
    merge:
      strategy: deep
+  profiles::puppet::server::dns_alt_names:
+    merge:
+      strategy: deep

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

@@ -180,6 +183,8 @@ profiles::packages::remove:
 profiles::base::scripts::scripts:
  puppet: puppetwrapper.py

+profiles::puppet::client::server: 'puppet.query.consul'
+profiles::puppet::client::ca_server: 'puppetca.query.consul'
 profiles::puppet::client::environment: 'develop'
 profiles::puppet::client::runinterval: 1800
 profiles::puppet::client::runtimeout: 3600