From 8f4799ce2a6f2a47b180f29a223a1072b2ccc079 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 19 May 2024 14:51:37 +1000
Subject: [PATCH 1/2] feat: update consul service service

- change edgecache service name from puppet -> edgecache
---
 hieradata/roles/infra/storage/edgecache.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hieradata/roles/infra/storage/edgecache.yaml b/hieradata/roles/infra/storage/edgecache.yaml
index af26945..67e6b28 100644
--- a/hieradata/roles/infra/storage/edgecache.yaml
+++ b/hieradata/roles/infra/storage/edgecache.yaml
@@ -1,6 +1,6 @@
 ---
 consul::services:
-  puppet:
+  edgecache:
     service_name: 'edgecache'
     tags:
       - 'cache'

From 96407798460b67937148f1be3028b11db2d6915e Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 12 May 2024 19:56:46 +1000
Subject: [PATCH 2/2] feat: mariadb improvements

- add bind-address to local_ip
- add consul service
---
 hieradata/roles/infra/sql/galera.yaml        | 19 +++++++++++++++++++
 site/profiles/manifests/sql/galera_member.pp |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/hieradata/roles/infra/sql/galera.yaml b/hieradata/roles/infra/sql/galera.yaml
index 28f9034..084072a 100644
--- a/hieradata/roles/infra/sql/galera.yaml
+++ b/hieradata/roles/infra/sql/galera.yaml
@@ -6,3 +6,22 @@ profiles::sql::galera_member::galera_members_role: roles::infra::sql::galera
 profiles::sql::galera_member::datadir: /data/mariadb
 profiles::sql::galera_member::innodb_file_per_table: 1
 profiles::sql::galera_member::package_name: mariadb-galera-server
+
+consul::services:
+  mariadb:
+    service_name: "mariadb-%{facts.environment}"
+    tags:
+      - 'database'
+      - 'mariadb'
+    address: "%{facts.networking.ip}"
+    port: 3306
+    checks:
+      - id: 'mariadb_tcp_check'
+        name: 'MariaDB TCP Check'
+        tcp: "%{facts.networking.ip}:3306"
+        interval: '10s'
+        timeout: '1s'
+profiles::consul::client::node_rules:
+  - resource: service
+    segment: "mariadb-%{facts.environment}"
+    disposition: write
diff --git a/site/profiles/manifests/sql/galera_member.pp b/site/profiles/manifests/sql/galera_member.pp
index a55d5fd..24fab57 100644
--- a/site/profiles/manifests/sql/galera_member.pp
+++ b/site/profiles/manifests/sql/galera_member.pp
@@ -103,7 +103,8 @@ class profiles::sql::galera_member (
         'binlog_format'            => 'ROW',
         'default-storage-engine'   => 'innodb',
         'query_cache_size'         => '0',
-        'query_cache_type'         => '0'
+        'query_cache_type'         => '0',
+        'bind-address'             => $local_ip,
       }
     }
     $default_override_options_galera = {