james/ansible
1
0
Fork 0
forked from infra/ansible
Code Pull requests Activity

forgejo: fixing error with hostname in template

Browse source 
Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
This commit is contained in:
David Kirwan 2025-11-06 12:07:54 +00:00
commit a80e25ff0c
Signed by untrusted user: dkirwan
GPG key ID: A5893AB6474AC37D
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/openshift-apps/forgejo/templates/valkey-configmap.yaml.j2
View file

@ -45,7 +45,7 @@ data:
if [ "$i" -eq 0 ]; then
NODES="${NODES} ${POD_IP}:6379"
else
NODES="${NODES} valkey-${i}.valkey.{{ namespace | default('default') }}.svc.cluster.local:6379"
NODES="${NODES} valkey-${i}.valkey.forgejo.svc.cluster.local:6379"
fi
done
REPLICAS_PER_PRIMARY=$(( ({{ replicas }} - ${PRIMARIES}) / ${PRIMARIES} ))
@ -55,7 +55,7 @@ data:
elif [ "$ORDINAL" -ge "$PRIMARIES" ]; then
# ---- Replica node ---------------------------------------------------
PRIMARY_IDX=$(( ORDINAL % PRIMARIES ))
PRIMARY_HOST="valkey-${PRIMARY_IDX}.valkey.{{ namespace | default('default') }}.svc.cluster.local"
PRIMARY_HOST="valkey-${PRIMARY_IDX}.valkey.forgejo.svc.cluster.local"
until valkey-cli -h "${PRIMARY_HOST}" -p 6379 -a "${VALKEY_PASSWORD}" ping >/dev/null 2>&1; do
echo "Waiting for primary ${PRIMARY_HOST}..."
sleep 5
@ -64,11 +64,11 @@ data:
--cluster add-node "${POD_IP}:6379" "${PRIMARY_HOST}:6379" --cluster-slave
else
# ---- Additional primary --------------------------------------------
until valkey-cli -h valkey-0.valkey.{{ namespace | default('default') }}.svc.cluster.local \
until valkey-cli -h valkey-0.valkey.forgejo.svc.cluster.local \
-p 6379 -a "${VALKEY_PASSWORD}" ping >/dev/null 2>&1; do
echo "Waiting for valkey-0..."
sleep 5
done
valkey-cli -a "${VALKEY_PASSWORD}" \
--cluster add-node "${POD_IP}:6379" valkey-0.valkey.{{ namespace | default('default') }}.svc.cluster.local:6379
--cluster add-node "${POD_IP}:6379" valkey-0.valkey.forgejo.svc.cluster.local:6379
fi