From e1449f58d02b2d5f6c58d2b8172dcfef76abb5cb Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Sat, 30 May 2026 21:32:41 +0200
Subject: [PATCH] [opennebula-docker] 0.2.5 refactor key inject

---
 opennebula-docker/Dockerfile_0.2.5 | 1 +
 opennebula-docker/README.org       | 4 ++++
 opennebula-docker/entrypoint.sh    | 8 +++++---
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 120000 opennebula-docker/Dockerfile_0.2.5

diff --git a/opennebula-docker/Dockerfile_0.2.5 b/opennebula-docker/Dockerfile_0.2.5
new file mode 120000
index 0000000..94aaeb3
--- /dev/null
+++ b/opennebula-docker/Dockerfile_0.2.5
@@ -0,0 +1 @@
+Dockerfile_0.2.2
\ No newline at end of file
diff --git a/opennebula-docker/README.org b/opennebula-docker/README.org
index 0d0a926..f10316e 100644
--- a/opennebula-docker/README.org
+++ b/opennebula-docker/README.org
@@ -1,3 +1,7 @@
+* 0.2.5, 2026-05-30
+  - Refactor key injection
+* 0.2.4, 2026-05-30
+  - Allow unset variables
 * 0.2.3, 2026-05-30
   - Add support for libvirtd secret
   - Set rbd format to version 2
diff --git a/opennebula-docker/entrypoint.sh b/opennebula-docker/entrypoint.sh
index 08bf036..9e21e98 100755
--- a/opennebula-docker/entrypoint.sh
+++ b/opennebula-docker/entrypoint.sh
@@ -53,17 +53,19 @@ while true; do
     ######################################################################
     # /etc/ceph/ceph.conf
     mon_hosts=$(sed 's/[a-z]*=\[/[/g' /etc/rook/mon-endpoints)
-    ceph_keyring=$(ceph auth get "client.${CEPH_KEYNAME}" | grep -v caps)
 
     # Re-generate ceph.conf (might needs this if we are a bridge host)
     cat > /etc/ceph/ceph.conf <<EOF
 [global]
 rbd_default_format = 2
 mon_host = $mon_hosts
-
-$ceph_keyring
 EOF
 
+    if [ -e /ceph-secret/key -a -e /ceph-secret/name ]; then
+        echo "[$(cat /ceph-secret/name)]" >> /etc/ceph/ceph.conf
+        echo "key = $(cat /ceph-secret/key)" >> /etc/ceph/ceph.conf
+    fi
+
     ######################################################################
     # libvirtd logic
     if [ -z "$SKIP_LIBVIRTD" ]; then