From b185c62f103e7dea34c33d6924c99cfb4c765a4b Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Mon, 5 Oct 2026 21:12:56 +1100 Subject: [PATCH 1/2] consul: use static server list for client retry_join --- hieradata/common.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index e29de34..e1dc833 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -236,7 +236,13 @@ profiles::dns::updater::key_algorithm: 'hmac-sha256' #profiles::dns::base::use_ns: 'region' profiles::consul::server::members_role: roles::infra::storage::consul profiles::consul::token::node_editor::accessor_id: '024e27bd-c5bb-41e7-a578-b766509e11bc' -profiles::consul::client::members_lookup: true +profiles::consul::client::members_lookup: false +profiles::consul::client::consul_servers: + - ausyd1nxvm2005.main.unkin.net + - ausyd1nxvm2006.main.unkin.net + - ausyd1nxvm2007.main.unkin.net + - ausyd1nxvm2008.main.unkin.net + - ausyd1nxvm2009.main.unkin.net profiles::consul::client::members_role: roles::infra::storage::consul profiles::consul::client::node_rules: - resource: node -- 2.47.3 From 502c8155c0c6992f9c3f73901d096d10271f687f Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Mon, 5 Oct 2026 21:14:29 +1100 Subject: [PATCH 2/2] Scope static consul server list to syd1 --- hieradata/common.yaml | 8 +------- hieradata/country/au/region/syd1.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index e1dc833..e29de34 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -236,13 +236,7 @@ profiles::dns::updater::key_algorithm: 'hmac-sha256' #profiles::dns::base::use_ns: 'region' profiles::consul::server::members_role: roles::infra::storage::consul profiles::consul::token::node_editor::accessor_id: '024e27bd-c5bb-41e7-a578-b766509e11bc' -profiles::consul::client::members_lookup: false -profiles::consul::client::consul_servers: - - ausyd1nxvm2005.main.unkin.net - - ausyd1nxvm2006.main.unkin.net - - ausyd1nxvm2007.main.unkin.net - - ausyd1nxvm2008.main.unkin.net - - ausyd1nxvm2009.main.unkin.net +profiles::consul::client::members_lookup: true profiles::consul::client::members_role: roles::infra::storage::consul profiles::consul::client::node_rules: - resource: node diff --git a/hieradata/country/au/region/syd1.yaml b/hieradata/country/au/region/syd1.yaml index 7639c9e..87e186f 100644 --- a/hieradata/country/au/region/syd1.yaml +++ b/hieradata/country/au/region/syd1.yaml @@ -7,3 +7,11 @@ profiles_dns_upstream_forwarder_consul: - 198.18.19.14 profiles_dns_upstream_forwarder_k8s: - 198.18.19.20 +profiles::consul::client::members_lookup: false +# static: k8s-compiled hosts can't see the servers in PuppetDB; update when servers change +profiles::consul::client::consul_servers: + - ausyd1nxvm2005.main.unkin.net + - ausyd1nxvm2006.main.unkin.net + - ausyd1nxvm2007.main.unkin.net + - ausyd1nxvm2008.main.unkin.net + - ausyd1nxvm2009.main.unkin.net -- 2.47.3