From 3ca92ee1f3941194ad853889d09793f532be0865 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Wed, 24 Apr 2024 23:55:50 +1000
Subject: [PATCH] fix: consul members role key

- moved members_role for consul to common yaml
---
 hieradata/common.yaml                     | 1 +
 hieradata/roles/infra/storage/consul.yaml | 1 -
 site/profiles/manifests/consul/server.pp  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b487c13..4b54a2b 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -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
diff --git a/hieradata/roles/infra/storage/consul.yaml b/hieradata/roles/infra/storage/consul.yaml
index e3eb0fd..855a0f1 100644
--- a/hieradata/roles/infra/storage/consul.yaml
+++ b/hieradata/roles/infra/storage/consul.yaml
@@ -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'
diff --git a/site/profiles/manifests/consul/server.pp b/site/profiles/manifests/consul/server.pp
index 295fa54..9dbffc0 100644
--- a/site/profiles/manifests/consul/server.pp
+++ b/site/profiles/manifests/consul/server.pp
@@ -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']}"