unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: consul members role key

Browse Source 
- moved members_role for consul to common yaml
This commit is contained in:
Ben Vincent 2024-04-24 23:55:50 +10:00
parent 98deb58fde
commit 3ca92ee1f3
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hieradata/common.yaml
View File

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

1
hieradata/roles/infra/storage/consul.yaml
View File

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

1
site/profiles/manifests/consul/server.pp
View File

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