Remove unneeded fqcn for modules & fix CI

roles/backup/tasks/awx-cro.yml

@@ -31,7 +31,7 @@
     awx_object_template: "{{ lookup('file', '_secrets/awx_object.yml') }}"
 
 - name: Write awx object to pvc
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-

roles/backup/tasks/cleanup.yml

@@ -2,12 +2,12 @@
 
 # After copying secret files to the PVC, delete the local tmp copies
 - name: Clean up _secrets directory
-  ansible.builtin.file:
+  file:
     path: "_secrets"
     state: absent
 
 - name: Delete any existing management pod
-  community.kubernetes.k8s:
+  k8s:
     name: "{{ meta.name }}-db-management"
     kind: Pod
     namespace: "{{ tower_backup_pvc_namespace }}"

roles/backup/tasks/error_handling.yml

@@ -10,7 +10,7 @@
     now: '{{ lookup("pipe", "date +%FT%TZ") }}'
 
 - name: Emit ocp event with error
-  community.kubernetes.k8s:
+  k8s:
     kind: Event
     namespace: "{{ meta.namespace }}"
     template: "event.yml.j2"

roles/backup/tasks/init.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Delete any existing management pod
-  community.kubernetes.k8s:
+  k8s:
     name: "{{ meta.name }}-db-management"
     kind: Pod
     namespace: "{{ tower_backup_pvc_namespace }}"
@@ -46,14 +46,14 @@
     backup_pvc: "{{ tower_backup_pvc | default(_default_backup_pvc, true) }}"
 
 - name: Create PVC for backup
-  community.kubernetes.k8s:
+  k8s:
     kind: PersistentVolumeClaim
     template: "backup_pvc.yml.j2"
   when:
     - tower_backup_pvc == '' or tower_backup_pvc is not defined
 
 - name: Create management pod from templated deployment config
-  community.kubernetes.k8s:
+  k8s:
     name: "{{ meta.name }}-db-management"
     kind: Deployment
     state: present

roles/backup/tasks/postgres.yml

@@ -51,21 +51,21 @@
     backup_dir: "/backups/tower-openshift-backup-{{ now }}"
 
 - name: Create directory for backup
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
       mkdir -p {{ backup_dir }}
 
 - name: Precreate file for database dump
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
       touch {{ backup_dir }}/tower.db
 
 - name: Set permissions on file for database dump
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
@@ -81,7 +81,7 @@
       -p {{ awx_postgres_port }}
 
 - name: Write pg_dump to backup on PVC
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-

roles/backup/tasks/secrets.yml

@@ -28,7 +28,7 @@
     secret_key_template: "{{ lookup('file', '_secrets/secret_key_secret.yml') }}"
 
 - name: Write secret_key to pvc
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
@@ -56,7 +56,7 @@
     admin_password_template: "{{ lookup('file', '_secrets/admin_password_secret.yml') }}"
 
 - name: Write secret_key to pvc
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
@@ -84,7 +84,7 @@
     broadcast_websocket_template: "{{ lookup('file', '_secrets/broadcast_websocket_secret.yml') }}"
 
 - name: Write broadcast_websocket definition to pvc
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
@@ -117,7 +117,7 @@
     postgres_secret_template: "{{ lookup('file', '_secrets/postgres_secret.yml') }}"
 
 - name: Write postgres configuration to pvc
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-

roles/installer/tasks/initialize_django.yml

@@ -1,6 +1,6 @@
 ---
 - name: Check if there are any super users defined.
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ meta.namespace }}"
     pod: "{{ tower_pod_name }}"
     container: "{{ meta.name }}-task"
@@ -14,7 +14,7 @@
   changed_when: users_result.return_code > 0
 
 - name: Create super user via Django if it doesn't exist.
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ meta.namespace }}"
     pod: "{{ tower_pod_name }}"
     container: "{{ meta.name }}-task"
@@ -25,7 +25,7 @@
   when: users_result.return_code > 0
 
 - name: Create preload data if necessary.  # noqa 305
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ meta.namespace }}"
     pod: "{{ tower_pod_name }}"
     container: "{{ meta.name }}-task"

roles/installer/tasks/load_ldap_cacert_secret.yml

@@ -1,6 +1,6 @@
 ---
 - name: Retrieve LDAP CA Certificate Secret
-  community.kubernetes.k8s_info:
+  k8s_info:
     kind: Secret
     namespace: '{{ meta.namespace }}'
     name: '{{ ldap_cacert_secret }}'

roles/installer/tasks/load_route_tls_secret.yml

@@ -1,6 +1,6 @@
 ---
 - name: Retrieve Route TLS Secret
-  community.kubernetes.k8s_info:
+  k8s_info:
     kind: Secret
     namespace: '{{ meta.namespace }}'
     name: '{{ tower_route_tls_secret }}'

roles/installer/tasks/migrate_data.yml

@@ -44,7 +44,7 @@
       -p {{ awx_postgres_port }}
 
 - name: Stream backup from pg_dump to the new postgresql container
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ meta.namespace }}"
     pod: "{{ postgres_pod_name }}"
     command: |

roles/installer/tasks/update_status.yml

@@ -18,7 +18,7 @@
       towerAdminUser: "{{ tower_admin_user }}"
 
 - name: Retrieve instance version
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ meta.namespace }}"
     pod: "{{ tower_pod_name }}"
     container: "{{ meta.name }}-task"
@@ -47,7 +47,7 @@
 
 - block:
     - name: Retrieve route URL
-      community.kubernetes.k8s_info:
+      k8s_info:
         kind: Route
         namespace: '{{ meta.namespace }}'
         name: '{{ meta.name }}'

roles/restore/tasks/apply_secret.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Get secret definition from pvc
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-

roles/restore/tasks/cleanup.yml

@@ -1,12 +1,12 @@
 ---
 
 - name: Clean up _secrets directory
-  ansible.builtin.file:
+  file:
     path: "_definitions"
     state: absent
 
 - name: Delete any existing management pod
-  community.kubernetes.k8s:
+  k8s:
     name: "{{ meta.name }}-db-management"
     kind: Pod
     namespace: "{{ tower_backup_pvc_namespace }}"

roles/restore/tasks/error_handling.yml

@@ -10,7 +10,7 @@
     now: '{{ lookup("pipe", "date +%FT%TZ") }}'
 
 - name: Emit ocp event with error
-  community.kubernetes.k8s:
+  k8s:
     kind: Event
     namespace: "{{ meta.namespace }}"
     template: "event.yml.j2"

roles/restore/tasks/init.yml

@@ -35,7 +35,7 @@
     - provided_pvc.resources | length == 0
 
 - name: Delete any existing management pod
-  community.kubernetes.k8s:
+  k8s:
     name: "{{ meta.name }}-db-management"
     kind: Pod
     namespace: "{{ tower_backup_pvc_namespace }}"
@@ -44,7 +44,7 @@
     wait: true
 
 - name: Create management pod from templated deployment config
-  community.kubernetes.k8s:
+  k8s:
     name: "{{ meta.name }}-db-management"
     kind: Deployment
     state: present
@@ -52,16 +52,13 @@
     wait: true
 
 - name: Check to make sure backup directory exists on PVC
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
       bash -c "stat {{ tower_backup_dir }}"
   register: stat_backup_dir
 
-- debug:
-    msg: "{{stat_backup_dir}}"
-
 - name: Error if backup dir is missing
   block:
     - name: Set error message

roles/restore/tasks/init_awx.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Get AWX object definition from pvc
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ tower_backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
@@ -22,10 +22,10 @@
     apply: yes
     wait: yes
     template: "_definitions/awx_object.yml.j2"
-    wait: true
 
 
-# TODO: The awx object and secrets need to be applied from the awx-operator, because that is where the service account is?.  So we will need to either copy them over or pipe them into a template command
+# TODO: The awx object and secrets need to be applied from the awx-operator, because that is where the service account is?
+#       So we will need to either copy them over or pipe them into a template command
 
 # TODO: Add logic to allow users to provide override values here,
 #       or to specify spec values that were not in the backed up AWX object.

roles/restore/tasks/postgres.yml

@@ -67,7 +67,7 @@
       -p {{ awx_postgres_port }}
 
 - name: Restore database dump to the new postgresql container
-  community.kubernetes.k8s_exec:
+  k8s_exec:
     namespace: "{{ meta.namespace }}"
     pod: "{{ postgres_pod_name }}"
     command: |