Port to ansible-core+collections

images/installer/Dockerfile

@@ -24,10 +24,10 @@ 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 python3 && \
+RUN yum install -y epel-release && \
     yum config-manager --enable built > /dev/null && \
     yum install --setopt=tsflags=nodocs -y \
-      'ansible < 2.10' \
+      ansible-core \
       openshift-ansible-test && \
     yum clean all
 

openshift-ansible.spec

@@ -17,7 +17,9 @@ 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 >= 2.9.10 or ansible-core >= 2.11.0)
+Requires:      ansible-collection-community-general
+Requires:      ansible-collection-ansible-posix
 Requires:      openshift-clients
 Requires:      openssl
 
@@ -61,10 +63,12 @@ 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 >= 2.9.10 or ansible-core >= 2.11.0)
+Requires:      ansible-collection-community-general
+Requires:      ansible-collection-ansible-posix
 Requires:      openssh-clients
-#Requires:      python3-boto
-Requires:      python3-boto3
+#Requires:      python38-boto
+#Requires:      python38-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.13

requirements.yml

@@ -0,0 +1,4 @@
+--
+collections:
+- name: ansible.posix
+- name: community.general

roles/openshift_node/meta/main.yml

@@ -11,4 +11,6 @@ galaxy_info:
     - 7
   categories:
   - cloud
-dependencies: []
+dependencies:
+  - ansible.posix
+  - community.general

roles/openshift_node/tasks/config.yml

@@ -26,7 +26,7 @@
 # startup, but if the network service is restarted this setting is
 # lost. Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1372388
 - name: Enable IP Forwarding
-  sysctl:
+  ansible.posix.sysctl:
     name: net.ipv4.ip_forward
     value: 1
     sysctl_file: "/etc/sysctl.d/99-openshift.conf"
@@ -45,19 +45,19 @@
   - not ('Could not find the requested service' in service_status.msg)
 
 - name: Setting sebool container_manage_cgroup
-  seboolean:
+  ansible.posix.seboolean:
     name: container_manage_cgroup
     state: yes
     persistent: yes
 
 - name: Setting sebool virt_use_samba
-  seboolean:
+  ansible.posix.seboolean:
     name: virt_use_samba
     state: yes
     persistent: yes
 
 - name: Setting sebool container_use_cephfs
-  seboolean:
+  ansible.posix.seboolean:
     name: container_use_cephfs
     state: yes
     persistent: yes

roles/openshift_node/tasks/install.yml

@@ -104,7 +104,7 @@
 
 # persistent storage in journal is needed for MachineConfig to work
 - name: Enable persistent storage on journal
-  ini_file:
+  community.general.ini_file:
     dest: "/etc/systemd/journald.conf"
     section: Journal
     option: Storage