From f1db95dfe71af0df7933ee746e580e6c5aa4dc07 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 29 Jun 2025 17:14:28 +1000
Subject: [PATCH 1/2] chore: add additional roles

- update boilerplate roles available
---
 templates/base/boilerplate.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/base/boilerplate.yml b/templates/base/boilerplate.yml
index ca5620f..372ffd3 100644
--- a/templates/base/boilerplate.yml
+++ b/templates/base/boilerplate.yml
@@ -52,6 +52,7 @@ variables:
       - roles::infra::git::gitea
       - roles::infra::git::runner
       - roles::infra::halb::haproxy
+      - roles::infra::halb::haproxy2
       - roles::infra::incus::imagehost
       - roles::infra::incus::node
       - roles::infra::k8s::controller
@@ -77,6 +78,7 @@ variables:
       - roles::infra::reposync::syncer
       - roles::infra::sql::galera
       - roles::infra::sql::patroni
+      - roles::infra::sql::shared
       - roles::infra::storage::consul
       - roles::infra::storage::edgecache
       - roles::infra::storage::minio

From 1e7aa21756154e9156e5ca82ca05ebd4dcbdd7e1 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Tue, 1 Jul 2025 20:38:29 +1000
Subject: [PATCH 2/2] feat: add shared patroni cluster

- add a three node shared patroni cluster
---
 config/instances/ausyd1nxvm2077/config.yaml   | 13 +++++
 .../instances/ausyd1nxvm2077/terragrunt.hcl   | 52 +++++++++++++++++++
 config/instances/ausyd1nxvm2078/config.yaml   | 13 +++++
 .../instances/ausyd1nxvm2078/terragrunt.hcl   | 52 +++++++++++++++++++
 config/instances/ausyd1nxvm2079/config.yaml   | 13 +++++
 .../instances/ausyd1nxvm2079/terragrunt.hcl   | 52 +++++++++++++++++++
 6 files changed, 195 insertions(+)
 create mode 100644 config/instances/ausyd1nxvm2077/config.yaml
 create mode 100644 config/instances/ausyd1nxvm2077/terragrunt.hcl
 create mode 100644 config/instances/ausyd1nxvm2078/config.yaml
 create mode 100644 config/instances/ausyd1nxvm2078/terragrunt.hcl
 create mode 100644 config/instances/ausyd1nxvm2079/config.yaml
 create mode 100644 config/instances/ausyd1nxvm2079/terragrunt.hcl

diff --git a/config/instances/ausyd1nxvm2077/config.yaml b/config/instances/ausyd1nxvm2077/config.yaml
new file mode 100644
index 0000000..15a8ef0
--- /dev/null
+++ b/config/instances/ausyd1nxvm2077/config.yaml
@@ -0,0 +1,13 @@
+description: Patroni Shared Prod
+cobbler_mgmt_classes:
+  - roles::infra::sql::shared
+profiles:
+  - disk10
+  - net_com1_eth0
+  - 2core4096
+storage_volumes:
+  data:
+    pool: fastpool
+    path: /data
+    config:
+      size: 50GB
diff --git a/config/instances/ausyd1nxvm2077/terragrunt.hcl b/config/instances/ausyd1nxvm2077/terragrunt.hcl
new file mode 100644
index 0000000..b33a99b
--- /dev/null
+++ b/config/instances/ausyd1nxvm2077/terragrunt.hcl
@@ -0,0 +1,52 @@
+locals {
+  node_name     = "prodnxsr0012"
+  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
+  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
+  config            = merge(local.config_common, local.config_specific)
+  instance_name     = basename(get_terragrunt_dir())
+}
+
+inputs = merge(
+  {
+    name = local.instance_name
+  },
+  local.config
+)
+
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+}
+
+include "instances" {
+  path   = find_in_parent_folders("instances.hcl")
+  expose = true
+  merge_strategy = "deep"
+}
+
+dependencies {
+  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
+}
+
+terraform {
+  source = "${get_repo_root()}/modules/instance"
+}
+
+generate "incus" {
+  path      = "incus.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+    provider "incus" {
+      generate_client_certificates = true
+      accept_remote_certificate    = true
+
+      remote {
+        name    = "${basename(get_terragrunt_dir())}"
+        scheme  = "https"
+        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
+        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
+        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
+        default = true
+      }
+    }
+  EOF
+}
diff --git a/config/instances/ausyd1nxvm2078/config.yaml b/config/instances/ausyd1nxvm2078/config.yaml
new file mode 100644
index 0000000..15a8ef0
--- /dev/null
+++ b/config/instances/ausyd1nxvm2078/config.yaml
@@ -0,0 +1,13 @@
+description: Patroni Shared Prod
+cobbler_mgmt_classes:
+  - roles::infra::sql::shared
+profiles:
+  - disk10
+  - net_com1_eth0
+  - 2core4096
+storage_volumes:
+  data:
+    pool: fastpool
+    path: /data
+    config:
+      size: 50GB
diff --git a/config/instances/ausyd1nxvm2078/terragrunt.hcl b/config/instances/ausyd1nxvm2078/terragrunt.hcl
new file mode 100644
index 0000000..5326e08
--- /dev/null
+++ b/config/instances/ausyd1nxvm2078/terragrunt.hcl
@@ -0,0 +1,52 @@
+locals {
+  node_name     = "prodnxsr0013"
+  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
+  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
+  config            = merge(local.config_common, local.config_specific)
+  instance_name     = basename(get_terragrunt_dir())
+}
+
+inputs = merge(
+  {
+    name = local.instance_name
+  },
+  local.config
+)
+
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+}
+
+include "instances" {
+  path   = find_in_parent_folders("instances.hcl")
+  expose = true
+  merge_strategy = "deep"
+}
+
+dependencies {
+  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
+}
+
+terraform {
+  source = "${get_repo_root()}/modules/instance"
+}
+
+generate "incus" {
+  path      = "incus.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+    provider "incus" {
+      generate_client_certificates = true
+      accept_remote_certificate    = true
+
+      remote {
+        name    = "${basename(get_terragrunt_dir())}"
+        scheme  = "https"
+        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
+        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
+        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
+        default = true
+      }
+    }
+  EOF
+}
diff --git a/config/instances/ausyd1nxvm2079/config.yaml b/config/instances/ausyd1nxvm2079/config.yaml
new file mode 100644
index 0000000..15a8ef0
--- /dev/null
+++ b/config/instances/ausyd1nxvm2079/config.yaml
@@ -0,0 +1,13 @@
+description: Patroni Shared Prod
+cobbler_mgmt_classes:
+  - roles::infra::sql::shared
+profiles:
+  - disk10
+  - net_com1_eth0
+  - 2core4096
+storage_volumes:
+  data:
+    pool: fastpool
+    path: /data
+    config:
+      size: 50GB
diff --git a/config/instances/ausyd1nxvm2079/terragrunt.hcl b/config/instances/ausyd1nxvm2079/terragrunt.hcl
new file mode 100644
index 0000000..c3099a9
--- /dev/null
+++ b/config/instances/ausyd1nxvm2079/terragrunt.hcl
@@ -0,0 +1,52 @@
+locals {
+  node_name     = "prodnxsr0009"
+  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
+  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
+  config            = merge(local.config_common, local.config_specific)
+  instance_name     = basename(get_terragrunt_dir())
+}
+
+inputs = merge(
+  {
+    name = local.instance_name
+  },
+  local.config
+)
+
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+}
+
+include "instances" {
+  path   = find_in_parent_folders("instances.hcl")
+  expose = true
+  merge_strategy = "deep"
+}
+
+dependencies {
+  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
+}
+
+terraform {
+  source = "${get_repo_root()}/modules/instance"
+}
+
+generate "incus" {
+  path      = "incus.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+    provider "incus" {
+      generate_client_certificates = true
+      accept_remote_certificate    = true
+
+      remote {
+        name    = "${basename(get_terragrunt_dir())}"
+        scheme  = "https"
+        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
+        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
+        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
+        default = true
+      }
+    }
+  EOF
+}