feat: Fix for latest deployment

roles/nginx/tasks/deploy.yaml

@@ -23,24 +23,18 @@
 
 - name: Creating namespace material
   k8s:
-    definition: "{{ lookup('template', '{{ item }}.yaml.j2') }}"
+    definition: "{{ lookup('template', item) }}"
     wait: yes
   loop:
-  - serviceaccount
-  - role
-
-- name: Relax {{ nx_namespace }} 'default' service account (for cert-manager)
-  k8s:
-    definition: "{{ lookup('template', 'rolebinding-default-sa.yaml.j2') }}"
-    wait: yes
+  - serviceaccount.yaml.j2
 
 - name: Deploy nginx ({{ nx_hostname }})
   k8s:
-    definition: "{{ lookup('template', '{{ item }}.yaml.j2') }}"
+    definition: "{{ lookup('template', item) }}"
     wait: yes
     wait_timeout: "{{ wait_timeout }}"
   loop:
-  - configmap
-  - deployment
-  - service
-  - ingress
+  - configmap.yaml.j2
+  - deployment.yaml.j2
+  - service.yaml.j2
+  - ingress.yaml.j2

roles/nginx/tasks/main.yaml

@@ -2,12 +2,6 @@
 
 - include_tasks: prep.yaml
 
-# If it looks like we're deploying to OpenShift
-# we need to use the k8s authentication module to login
-# and obtain an API key.
-- include_tasks: login.yaml
-  when: okd_master_hostname is defined
-
 # A kubernetes (or OpenShift) host and an API key must be set.
 # We will either have authenticated against an OpenShift server
 # or the AWX kubernetes credentials will have injected suitable
@@ -17,24 +11,19 @@
 - name: Assert authentication
   assert:
     that:
-    - k8s_auth_host|length > 0
-    - k8s_auth_api_key|length > 0
+    - k8s_auth_host | length > 0
+    - k8s_auth_api_key | length > 0
 
 # Go...
 
 - block:
 
   - include_tasks: deploy.yaml
-    when: nx_state|string == 'present'
+    when: nx_state | string == 'present'
   - include_tasks: undeploy.yaml
-    when: nx_state|string == 'absent'
+    when: nx_state | string == 'absent'
 
   module_defaults:
     group/k8s:
       host: "{{ k8s_auth_host }}"
       api_key: "{{ k8s_auth_api_key }}"
-
-# If it looks like we're deploying to OpenShift
-# we now need to logout...
-- include_tasks: logout.yaml
-  when: okd_master_hostname is defined

roles/nginx/tasks/prep.yaml

@@ -6,15 +6,6 @@
 - debug:
     var: ansible_version.full
 
-# Basic pre-playbook prerequisites.
-# We need the openshift/kubernetes module amongst other things...
-
-- name: Install prerequisite Python modules
-  pip:
-    name:
-    - jmespath==0.9.4
-    extra_args: --user
-
 # Kubernetes credentials ------------------------------------------------------
 
 # We don't use the Kubernetes credentials directly,