From 1e7dfb9d9d74619eba17c63810be89113e2479ca Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sat, 8 Nov 2025 19:19:44 +1100
Subject: [PATCH] feat: manage additional ceph sections (#419)

- ensure mons configuration are managed in code
- ensure radowgw configuration are managed in code

Reviewed-on: https://git.unkin.net/unkin/puppet-prod/pulls/419
---
 hieradata/common.yaml                 | 46 +++++++++++++++++++++++++++
 site/profiles/templates/ceph/conf.erb |  2 +-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5dfadad..68d3648 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -129,6 +129,9 @@ lookup_options:
   profiles::ceph::client::keyrings:
     merge:
       strategy: deep
+  profiles::ceph::conf::config:
+    merge:
+      strategy: deep
   profiles::nginx::simpleproxy::locations:
     merge:
       strategy: deep
@@ -404,6 +407,49 @@ profiles::ceph::conf::config:
       198.18.23.5/32,198.18.23.6/32,198.18.23.7/32,198.18.23.8/32,
       198.18.23.9/32,198.18.23.10/32,198.18.23.11/32,198.18.23.12/32,
       198.18.23.13/32
+  client.rgw.ausyd1nxvm2115:
+    rgw_realm: unkin
+    rgw_zonegroup: au
+    rgw_zone: syd1
+  client.rgw.ausyd1nxvm2116:
+    rgw_realm: unkin
+    rgw_zonegroup: au
+    rgw_zone: syd1
+  client.rgw.ausyd1nxvm2117:
+    rgw_realm: unkin
+    rgw_zonegroup: au
+    rgw_zone: syd1
+  client.rgw.ausyd1nxvm2118:
+    rgw_realm: unkin
+    rgw_zonegroup: au
+    rgw_zone: syd1
+  client.rgw.ausyd1nxvm2119:
+    rgw_realm: unkin
+    rgw_zonegroup: au
+    rgw_zone: syd1
+  mds:
+    keyring: /var/lib/ceph/mds/ceph-$id/keyring
+    mds_standby_replay: true
+  mds.prodnxsr0009-1:
+    host: prodnxsr0009
+  mds.prodnxsr0009-2:
+    host: prodnxsr0009
+  mds.prodnxsr0010-1:
+    host: prodnxsr0010
+  mds.prodnxsr0010-2:
+    host: prodnxsr0010
+  mds.prodnxsr0011-1:
+    host: prodnxsr0011
+  mds.prodnxsr0011-2:
+    host: prodnxsr0011
+  mds.prodnxsr0012-1:
+    host: prodnxsr0012
+  mds.prodnxsr0012-2:
+    host: prodnxsr0012
+  mds.prodnxsr0013-1:
+    host: prodnxsr0013
+  mds.prodnxsr0013-2:
+    host: prodnxsr0013
 
 #profiles::base::hosts::additional_hosts:
 #  - ip: 198.18.17.9
diff --git a/site/profiles/templates/ceph/conf.erb b/site/profiles/templates/ceph/conf.erb
index 52024fd..e8f5316 100644
--- a/site/profiles/templates/ceph/conf.erb
+++ b/site/profiles/templates/ceph/conf.erb
@@ -2,7 +2,7 @@
 <% @config.each do |section, settings| -%>
 [<%= section %>]
 <% settings.each do |key, value| -%>
-<%# Convert booleans and numbers to strings, leave strings untouched %>
+<%# Convert booleans and numbers to strings, leave strings untouched -%>
 <%= key %> = <%= value.is_a?(TrueClass) ? 'true' : value.is_a?(FalseClass) ? 'false' : value %>
 <% end -%>