Skip to content

Commit bc15daa

Browse files
Merge pull request #7549 from barbacbd/fix_openstack_image_ansible
OCPBUGS-20058: Use updated ansible-core for Openstack image
2 parents 8783558 + 0426d51 commit bc15daa

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

images/openstack/Dockerfile.ci

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,19 @@ RUN yum install --setopt=tsflags=nodocs -y gettext make git gzip util-linux glib
2626

2727
RUN yum update -y && \
2828
yum install --setopt=tsflags=nodocs -y \
29-
ansible-core unzip jq nmap && \
29+
python38 unzip jq nmap && \
3030
yum erase -y python36 && \
3131
yum clean all && rm -rf /var/cache/yum/*
3232

33+
RUN python3 -m pip install --upgrade pip
34+
3335
# ansible 2.9 is EOL in September 2023, so we need to install ansible-core and get the collections from source
3436
# until we have a package available.
37+
RUN python3 -m pip install ansible-core
3538
RUN ansible-galaxy collection install openstack.cloud ansible.utils community.general && \
3639
mkdir -p /usr/share/ansible/collections/ansible_collections && \
3740
cp -r /root/.ansible/collections/ansible_collections/* /usr/share/ansible/collections/ansible_collections/
3841

39-
RUN python3 -m pip install --upgrade pip
4042
# ansible-core comes with python3.8 but openstacksdk comes with python3.6 so let's install them from pip.
4143
RUN python3 -m pip install yq openstackclient openstacksdk netaddr
4244

0 commit comments

Comments
 (0)