Merge pull request #12416 from openshift-cherrypick-robot/cherry-pick…

…-12397-to-release-4.11

[release-4.11] Bug 2117370: Port to ansible-core

.flake8

@@ -1,6 +1,7 @@
 [flake8]
 # TODO: cleanup flake8 issues with utils/test/*
-exclude=.tox,inventory
+# bundled ansible modules are copied as-is, have their own standards
+exclude=.tox,inventory,ini_file.py,seboolean.py,sysctl.py
 max_line_length = 120
 ignore = E501,T003
 per-file-ignores =

.pylintrc

@@ -8,7 +8,7 @@
 
 # Add files or directories to the ignore list. They should be base names, not
 # paths.
-ignore=CVS,setup.py
+ignore=CVS,setup.py,ini_file.py,seboolean.py,sysctl.py
 
 # Pickle collected data for later comparisons.
 persistent=no

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
 

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

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