From 46a1f3f3b9d72d4a0a6a52a1f90cdabb6b2df335 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 23 Jun 2022 14:20:17 -0400
Subject: [PATCH] Port to ansible-core

---
 images/installer/Dockerfile | 10 ++++++++--
 openshift-ansible.spec      |  6 ++----
 requirements.txt            |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile
index 798e6f61ab0..52c704eba36 100644
--- a/images/installer/Dockerfile
+++ b/images/installer/Dockerfile
@@ -22,13 +22,19 @@ ENV USER_UID=1001 \
 # Add image scripts and files for running as a system container
 COPY images/installer/root /
 # Install openshift-ansible RPMs
-RUN yum install -y centos-release-ansible-29 epel-release && \
+RUN yum install -y epel-release && \
     yum config-manager --enable built > /dev/null && \
     yum install --setopt=tsflags=nodocs -y \
-      'ansible < 2.10' \
+      'ansible-core < 2.14' \
+      python38-dateutil python38-urllib3 \
       openshift-ansible-test && \
     yum clean all
 
+# for ec2_ami_info (in workers-rhel-aws-provision CI step) which requires boto3
+RUN ansible-galaxy collection install -p /usr/share/ansible/collections amazon.aws && \
+    find $HOME/.ansible -delete && \
+    pip3 install boto3
+
 RUN /usr/local/bin/user_setup \
  && rm /usr/local/bin/usage.ocp
 
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index e7307f6c449..c296af3c87d 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -17,7 +17,7 @@ URL:            https://github.com/openshift/openshift-ansible
 Source0:        https://github.com/openshift/openshift-ansible/archive/%{commit}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 
-Requires:      ansible >= 2.9.5
+Requires:      ansible-core
 Requires:      openshift-clients
 Requires:      openssl
 
@@ -61,10 +61,8 @@ cp -rp test %{buildroot}%{_datadir}/ansible/%{name}/
 %package test
 Summary:       Openshift and Atomic Enterprise Ansible Test Playbooks
 Requires:      %{name} = %{version}-%{release}
-Requires:      ansible >= 2.9.5
+Requires:      ansible-core
 Requires:      openssh-clients
-#Requires:      python3-boto
-Requires:      python3-boto3
 BuildArch:     noarch
 
 %description test
diff --git a/requirements.txt b/requirements.txt
index aef64cbf352..66cb4fee32d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 # Versions are pinned to prevent pypi releases arbitrarily breaking
 # tests with new APIs/semantics. We want to update versions deliberately.
-ansible<2.10
+ansible-core<2.14