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 <> /etc/ceph/ceph.conf + echo "key = $(cat /ceph-secret/key)" >> /etc/ceph/ceph.conf + fi + ###################################################################### # libvirtd logic if [ -z "$SKIP_LIBVIRTD" ]; then