promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
3 changed files with 2 additions and 1 deletions
Showing only changes of commit 3ca92ee1f3 - Show all commits

View File

@ -59,6 +59,7 @@ profiles::base::puppet_servers:
profiles::dns::master::basedir: '/var/named/sources'
profiles::dns::base::ns_role: 'roles::infra::dns::resolver'
profiles::dns::base::use_ns: 'region'
profiles::consul::server::members_role: roles::infra::storage::consul
profiles::packages::install:
- bash-completion

View File

@ -1,5 +1,4 @@
---
profiles::consul::server::members_role: roles::infra::storage::consul
profiles::consul::server::members_lookup: true
profiles::consul::server::data_dir: /data/consul
profiles::consul::server::primary_datacenter: 'au-drw1'

View File

@ -47,6 +47,7 @@ class profiles::consul::server (
# wait for all attributes to be ready
if $facts['enc_role'] == $members_role {
# set a datacentre/cluster name
$consul_cluster = "${::facts['country']}-${::facts['region']}"