[opennebula-docker] 0.2.5 refactor key inject

This commit is contained in:
Nico Schottelius 2026-05-30 21:32:41 +02:00
commit e1449f58d0
3 changed files with 10 additions and 3 deletions

View file

@ -0,0 +1 @@
Dockerfile_0.2.2

View file

@ -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

View file

@ -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