From 9ebc365d691d200e159f8b0404d35cfa6f7531c9 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 16 Sep 2024 14:11:24 +0200
Subject: [PATCH] Renamed infra/image/inventory to build-inventory, dropped
interpreter
This change also removed ansible_python_interpreter setting in the
inventory as the interpreter should be discovered by ansible for the
distributions.
The dockerfiles have been adapted to not force the installation of
python3 for CentOS-Stream 8, 9 and 10.
---
infra/image/{inventory => build-inventory} | 2 +-
infra/image/build.sh | 2 +-
infra/image/dockerfile/c10s | 1 -
infra/image/dockerfile/c8s | 2 --
infra/image/dockerfile/c9s | 1 -
5 files changed, 2 insertions(+), 6 deletions(-)
rename infra/image/{inventory => build-inventory} (77%)
diff --git a/infra/image/inventory b/infra/image/build-inventory
similarity index 77%
rename from infra/image/inventory
rename to infra/image/build-inventory
index 4a83eb7..41f5feb 100644
--- a/infra/image/inventory
+++ b/infra/image/build-inventory
@@ -1,5 +1,5 @@
[ipaserver]
-ansible-freeipa-image-builder ansible_connection=podman ansible_python_interpreter=/usr/bin/python3
+ansible-freeipa-image-builder ansible_connection=podman
[ipaserver:vars]
ipaadmin_password=SomeADMINpassword
diff --git a/infra/image/build.sh b/infra/image/build.sh
index dc6b992..a17f2f6 100755
--- a/infra/image/build.sh
+++ b/infra/image/build.sh
@@ -68,7 +68,7 @@ then
deploy_playbook="${TOPDIR}/playbooks/install-server.yml"
[ -f "${deploy_playbook}" ] || die "Can't find playbook '${deploy_playbook}'"
- inventory_file="${BASEDIR}/inventory"
+ inventory_file="${BASEDIR}/build-inventory"
[ -f "${inventory_file}" ] || die "Can't find inventory '${inventory_file}'"
fi
diff --git a/infra/image/dockerfile/c10s b/infra/image/dockerfile/c10s
index 622098f..18d4814 100644
--- a/infra/image/dockerfile/c10s
+++ b/infra/image/dockerfile/c10s
@@ -4,7 +4,6 @@ ENV container=podman
RUN rm -fv /var/cache/dnf/metadata_lock.pid; \
dnf makecache; \
dnf --assumeyes install \
- /usr/bin/python3 \
/usr/bin/dnf-3 \
sudo \
bash \
diff --git a/infra/image/dockerfile/c8s b/infra/image/dockerfile/c8s
index 87a5b82..a59879f 100644
--- a/infra/image/dockerfile/c8s
+++ b/infra/image/dockerfile/c8s
@@ -7,8 +7,6 @@ sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo; \
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo; \
dnf makecache; \
dnf --assumeyes install \
- /usr/bin/python3 \
- /usr/bin/python3-config \
/usr/bin/dnf-3 \
sudo \
bash \
diff --git a/infra/image/dockerfile/c9s b/infra/image/dockerfile/c9s
index 5fe77d9..5897d9f 100644
--- a/infra/image/dockerfile/c9s
+++ b/infra/image/dockerfile/c9s
@@ -4,7 +4,6 @@ ENV container=podman
RUN rm -fv /var/cache/dnf/metadata_lock.pid; \
dnf makecache; \
dnf --assumeyes install \
- /usr/bin/python3 \
/usr/bin/dnf-3 \
sudo \
bash \
--
GitLab