Port to ansible-core

images/installer/Dockerfile

@@ -24,13 +24,17 @@ COPY images/installer/root /
 # Add origin repo for including the oc client
 COPY images/installer/origin-extra-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' \
       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
 

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 < 2.14.0
 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 < 2.14.0
 Requires:      openssh-clients
-#Requires:      python3-boto
-Requires:      python3-boto3
 BuildArch:     noarch
 
 %description test

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