mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-05-07 13:53:23 +00:00
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.
This commit is contained in:
@@ -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
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user