From dc1f503bdd56351c5b68375aaade64787f7c413a Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mar 30 2022 20:06:52 +0000
Subject: Revert "batcave: switch to ansible-core + some collections instead of ansible 'classic'"


This reverts commit 78ba658d3c9f80a1aa81f53ae2eb253201a09d8c.

---

diff --git a/roles/ansible-server/files/requirements.yml b/roles/ansible-server/files/requirements.yml
deleted file mode 100644
index 25a79a8..0000000
--- a/roles/ansible-server/files/requirements.yml
+++ /dev/null
@@ -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
diff --git a/roles/ansible-server/tasks/main.yml b/roles/ansible-server/tasks/main.yml
index 835b7a1..fc034df 100644
--- a/roles/ansible-server/tasks/main.yml
+++ b/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
-  command: ansible-galaxy install -r files/requirements.yml
-  tags:
-  - ansible-server
+# https://github.com/ansible/ansible-modules-core/pull/4070
+#- name: Fix the nova_compute module
+#  patch: src=4070.patch
+#         dest=/usr/lib/python2.7/site-packages/ansible/modules/cloud/openstack/_nova_compute.py
+#
+#
+# TODO:
+#  cgit?
+#  rbac-playbook?
+#  zodbot notifications?
+#
diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml
index a90c57e..af1f19e 100644
--- a/roles/batcave/tasks/main.yml
+++ b/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