Revert "batcave: switch to ansible-core + some collections instead of ansible 'classic'"

This reverts commit 78ba658d3c.

roles/ansible-server/files/requirements.yml

@@ -1,30 +0,0 @@
----
-collections:
-  - name: ansible.posix
-    type: git
-    source: https://github.com/ansible-collections/ansible.posix.git
-    version: 1.3.0
-  - name: community.general
-    type: git
-    source: https://github.com/ansible-collections/community.general.git
-    version: 4.6.1
-  - name: community.libvirt
-    type: git
-    source: https://github.com/ansible-collections/community.libvirt.git
-    version: 1.0.2
-  - name: community.mysql
-    type: git
-    source: https://github.com/ansible-collections/community.mysql.git
-    version: 3.1.2
-  - name: community.postgresql
-    type: git
-    source: https://github.com/ansible-collections/community.postgresql.git
-    version: 2.1.2
-  - name: community.docker
-    type: git
-    source: https://github.com/ansible-collections/community.docker.git
-    version: 2.3.0
-  - name: community.rabbitmq
-    type: git
-    source: https://github.com/ansible-collections/community.rabbitmq.git
-    version: 1.1.0

roles/ansible-server/tasks/main.yml

@@ -5,7 +5,7 @@
 - name: install needed packages
   package: name={{ item }} state=present
   with_items:
-  - ansible-core
+  - ansible
   - git
   tags:
   - packages
@@ -21,7 +21,14 @@
   tags:
   - ansible-server
 
-- name: install required collections
+# https://github.com/ansible/ansible-modules-core/pull/4070
-  command: ansible-galaxy install -r files/requirements.yml
+#- name: Fix the nova_compute module
-  tags:
+#  patch: src=4070.patch
-  - ansible-server
+#         dest=/usr/lib/python2.7/site-packages/ansible/modules/cloud/openstack/_nova_compute.py
+#
+#
+# TODO:
+#  cgit?
+#  rbac-playbook?
+#  zodbot notifications?
+#

roles/batcave/tasks/main.yml

@@ -25,7 +25,7 @@
   package: name={{ item }} state=present
   with_items:
   - srm                       # secure rm to delete sensitive files.
-  - ansible-core              # This is our ansible master, needs ansible installed.
+  - ansible                   # This is our ansible master, needs ansible installed.
   - ansible_utils             # Needed for rbac-playbook
   - yum-rhn-plugin            # Needed for rhn sync
   - createrepo_c              # Needed for rhn sync