Merge pull request #9 from RanabirChakraborty/validated_content_fix-2

Restructuring the collection for validated content proposal
ansible-middleware · Nov 15, 2024 · df0a49a · df0a49a
2 parents 686bb6a + d843015
commit df0a49a
Show file tree

Hide file tree

Showing 25 changed files with 33 additions and 453 deletions.
diff --git a/playbooks/datagrid.yml b/playbooks/datagrid.yml
@@ -8,7 +8,7 @@
   pre_tasks:
     - name: Configure promtail
       ansible.builtin.include_role:
-        name: promtail
+        name: infra.rhbk_ha_cluster.promtail
       when: not skip_promtail is defined
       vars:
         promtail_job_name: datagrid

diff --git a/playbooks/prerequisites.yml b/playbooks/prerequisites.yml
@@ -1,23 +1,26 @@
 ---
 - name: Playbook for installing prerequisites
   hosts: all
-  tasks:
-    - name: "Install packages"
+  vars:
+    fastpackages_packages_list:
+      - procps-ng
+      - mailcap
+      - unzip
+      - firewalld
+      - ca-certificates
+      - python3-lxml
+      - net-tools
+      - python3-policycoreutils
+      - policycoreutils-python-utils
+      - "{{ jvm_package }}"
+
+  pre_tasks:
+    - name: Install fastpackages prerequisites
       ansible.builtin.include_role:
-        name: fastpackages
-      vars:
-        fastpackages_packages_list:
-          - procps-ng
-          - mailcap
-          - unzip
-          - firewalld
-          - ca-certificates
-          - python3-lxml
-          - net-tools
-          - python3-policycoreutils
-          - policycoreutils-python-utils
-          - "{{ jvm_package }}"
-    - name: "Get FQDN"
+        name: infra.rhbk_ha_cluster.fastpackages
+
+  tasks:
+    - name: "Set SELinux to Permissive mode"
       ansible.builtin.command: "setenforce Permissive"
       become: yes
       changed_when: false
@@ -31,6 +34,8 @@
       become: yes
       when: current_fqdn.stdout != (inventory_hostname + domain_name)
       changed_when: true
-    - name: "Install certificates"
+
+  post_tasks:
+    - name: Install certificates prerequisites
       ansible.builtin.include_role:
-        name: certificates
+        name: infra.rhbk_ha_cluster.certificates
diff --git a/playbooks/rhbk.yml b/playbooks/rhbk.yml
@@ -4,15 +4,17 @@
   roles:
     - role: redhat.rhbk.rhbk
       rhbk_admin_pass: "{{ admin_pass }}"
+
   pre_tasks:
     - name: Configure promtail
       ansible.builtin.include_role:
-        name: promtail
+        name: infra.rhbk_ha_cluster.promtail
       when: not skip_promtail is defined
       vars:
         promtail_job_name: rhbk
         promtail_logfile: /var/log/sso/server.log
         promtail_region: "{{ hostvars[inventory_hostname].tags.Region }}"
+
   post_tasks:
     - name: Running rhbk_realm role
       ansible.builtin.include_role:

diff --git a/playbooks/roles/certificates/README.md b/playbooks/roles/certificates/README.md
diff --git a/playbooks/roles/certificates/defaults/main.yml b/playbooks/roles/certificates/defaults/main.yml
diff --git a/playbooks/roles/certificates/files/keystore.jks b/playbooks/roles/certificates/files/keystore.jks
diff --git a/playbooks/roles/certificates/files/my-root-ca.crt.pem b/playbooks/roles/certificates/files/my-root-ca.crt.pem
diff --git a/playbooks/roles/certificates/handlers/main.yml b/playbooks/roles/certificates/handlers/main.yml
diff --git a/playbooks/roles/certificates/meta/main.yml b/playbooks/roles/certificates/meta/main.yml
diff --git a/playbooks/roles/certificates/tasks/main.yml b/playbooks/roles/certificates/tasks/main.yml
diff --git a/playbooks/roles/fastpackages/README.md b/playbooks/roles/fastpackages/README.md
diff --git a/playbooks/roles/fastpackages/defaults/main.yml b/playbooks/roles/fastpackages/defaults/main.yml
diff --git a/playbooks/roles/fastpackages/meta/main.yml b/playbooks/roles/fastpackages/meta/main.yml
diff --git a/playbooks/roles/fastpackages/tasks/main.yml b/playbooks/roles/fastpackages/tasks/main.yml
diff --git a/playbooks/roles/promtail/README.md b/playbooks/roles/promtail/README.md
diff --git a/playbooks/roles/promtail/defaults/main.yml b/playbooks/roles/promtail/defaults/main.yml
diff --git a/playbooks/roles/promtail/handlers/main.yml b/playbooks/roles/promtail/handlers/main.yml
diff --git a/playbooks/roles/promtail/meta/main.yml b/playbooks/roles/promtail/meta/main.yml