From bf5b6556aec49b37d68e03fc67f40ea5e92133c8 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Thu, 28 Nov 2024 13:24:26 +0100 Subject: [PATCH] Bump ipa image in adoption script and make it a parameter Signed-off-by: Francesco Pantano --- devsetup/standalone/openstack.sh | 3 ++- devsetup/tripleo/tripleo_install.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devsetup/standalone/openstack.sh b/devsetup/standalone/openstack.sh index 9bd5754..21d758b 100755 --- a/devsetup/standalone/openstack.sh +++ b/devsetup/standalone/openstack.sh @@ -27,6 +27,7 @@ TLSE_ENABLED=${TLSE_ENABLED:-false} CLOUD_DOMAIN=${CLOUD_DOMAIN:-localdomain} TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true} OCTAVIA_ENABLED=${OCTAVIA_ENABLED:-false} +IPA_IMAGE=${IPA_IMAGE:-"quay.io/freeipa/freeipa-server:fedora-41"} # Use the files created in the previous steps including the network_data.yaml file and thw deployed_network.yaml file. # The deployed_network.yaml file hard codes the IPs and VIPs configured from the network.sh @@ -154,7 +155,7 @@ if [ "$TLSE_ENABLED" = "true" ]; then -h $IPA_SERVER_HOSTNAME \ --read-only --tmpfs /run --tmpfs /tmp \ -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /tmp/ipa-data:/data:Z quay.io/freeipa/freeipa-server:fedora-39 no-exit \ + -v /tmp/ipa-data:/data:Z "$IPA_IMAGE" no-exit \ -U -r $IPA_REALM --setup-dns --no-reverse --no-ntp \ --no-dnssec-validation --auto-forwarders timeout 900s grep -qEi '(INFO The ipa-server-install command was successful|ERROR The ipa-server-install command failed)' <(tail -F /tmp/ipa-data/var/log/ipaserver-install.log) diff --git a/devsetup/tripleo/tripleo_install.sh b/devsetup/tripleo/tripleo_install.sh index d1a1bbb..ee65bad 100755 --- a/devsetup/tripleo/tripleo_install.sh +++ b/devsetup/tripleo/tripleo_install.sh @@ -185,6 +185,7 @@ if [ "$TLSE_ENABLED" = "true" ]; then export IPA_REALM=$(echo $IPA_DOMAIN | awk '{print toupper($0)}') export IPA_HOST=ipa.$IPA_DOMAIN export IPA_SERVER_HOSTNAME=$IPA_HOST + export IPA_IMAGE=${IPA_IMAGE:-"quay.io/freeipa/freeipa-server:fedora-41"} sudo mkdir /tmp/ipa-data sudo podman run -d --name freeipa-server-container \ --sysctl net.ipv6.conf.lo.disable_ipv6=0 \ @@ -198,7 +199,7 @@ if [ "$TLSE_ENABLED" = "true" ]; then -p 88:88/udp -p 464:464/udp \ --read-only --tmpfs /run --tmpfs /tmp \ -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /tmp/ipa-data:/data:Z quay.io/freeipa/freeipa-server:fedora-39 no-exit \ + -v /tmp/ipa-data:/data:Z "$IPA_IMAGE" no-exit \ -U -r $IPA_REALM --setup-dns --no-reverse --no-ntp \ --no-dnssec-validation --auto-forwarders timeout 900s grep -qEi '(INFO The ipa-server-install command was successful|ERROR The ipa-server-install command failed)' <(sudo tail -F /tmp/ipa-data/var/log/ipaserver-install.log)