Fix Ansible Jinja templates

With a new verion of Ansible we are getting a warning that usage of the
variables in jinja template will be deprecated. This changes all
occurrences to the suggested variant.

Signed-off-by: Ales Raszka <araszka@redhat.com>

Author: Allda

ansible/roles/config_ocp_cluster/tasks/chat-trigger.yml

@@ -9,7 +9,7 @@
         apply: true
         validate_certs: "{{ k8s_validate_certs }}"
         namespace: "{{ pipelinerun_listener_namespace }}"
-        definition: "{{ lookup('file', '{{ item }}') }}"
+        definition: "{{ lookup('file', item) }}"
       with_fileglob:
         - ../files/tasks/*
 

ansible/roles/config_ocp_cluster/tasks/main.yml

@@ -5,7 +5,7 @@
   kubernetes.core.k8s:
     state: present
     validate_certs: "{{ k8s_validate_certs }}"
-    definition: "{{ lookup('file', '{{ item }}') }}"
+    definition: "{{ lookup('file', item) }}"
   with_items:
     - ../files/tektonconfig.yml
 

ansible/roles/config_ocp_cluster/tasks/metrics-trigger.yml

@@ -8,7 +8,7 @@
         namespace: "{{ pipelinerun_listener_namespace }}"
         state: present
         validate_certs: "{{ k8s_validate_certs }}"
-        definition: "{{ lookup('file', '{{ item }}') }}"
+        definition: "{{ lookup('file', item) }}"
       with_items:
         - ../templates/openshift/update-metrics.yml
         - ../templates/openshift/metrics-pipeline.yml

ansible/roles/index_signature_verification/tasks/main.yml

@@ -16,7 +16,7 @@
     apply: true
     validate_certs: "{{ k8s_validate_certs }}"
     namespace: "{{ k8s_namespace }}"
-    definition: "{{ lookup('file', '{{ item }}') }}"
+    definition: "{{ lookup('file', item) }}"
   with_fileglob:
     - ../files/configmaps/*
 
@@ -26,7 +26,7 @@
     apply: true
     validate_certs: "{{ k8s_validate_certs }}"
     namespace: "{{ k8s_namespace }}"
-    definition: "{{ lookup('file', '{{ item }}') }}"
+    definition: "{{ lookup('file', item) }}"
   with_fileglob:
     - ../files/tasks/*
 
@@ -36,7 +36,7 @@
     apply: true
     validate_certs: "{{ k8s_validate_certs }}"
     namespace: "{{ k8s_namespace }}"
-    definition: "{{ lookup('file', '{{ item }}') }}"
+    definition: "{{ lookup('file', item) }}"
   with_fileglob:
     - ../files/pipelines/*
 

ansible/roles/operator-pipeline/tasks/index-img-bootstrap-signing.yml

@@ -115,7 +115,7 @@
     state: present
     apply: true
     namespace: "{{ oc_index_bootstrap_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_items:
     - ../templates/openshift/tasks/set-env.yml
     - ../templates/openshift/tasks/index-signing-image-check.yml
@@ -129,6 +129,6 @@
     state: present
     apply: true
     namespace: "{{ oc_index_bootstrap_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_items:
     - ../templates/openshift/pipelines/index-img-bootstrap-signing-pipeline.yml

ansible/roles/operator-pipeline/tasks/index-img-signing.yml

@@ -23,7 +23,7 @@
     state: present
     apply: true
     namespace: "{{ oc_signing_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_items:
     - ../templates/openshift/tasks/set-env.yml
 
@@ -35,6 +35,6 @@
     state: present
     apply: true
     namespace: "{{ oc_signing_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_items:
     - ../templates/openshift/pipelines/index-img-signing-pipeline.yml

ansible/roles/operator-pipeline/tasks/main.yml

@@ -16,7 +16,7 @@
   kubernetes.core.k8s:
     state: present
     apply: true
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_items:
     - ../templates/openshift/openshift-pipelines-custom-scc.yml
     - ../templates/openshift/openshift-pipeline-sa-scc-role.yml
@@ -29,7 +29,7 @@
     state: present
     apply: true
     namespace: "{{ oc_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_fileglob:
     - ../templates/openshift/tasks/*
 
@@ -40,7 +40,7 @@
     state: present
     apply: true
     namespace: "{{ oc_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_items:
     - ../templates/openshift/pipelines/operator-hosted-pipeline.yml
     - ../templates/openshift/pipelines/operator-release-pipeline.yml
@@ -52,7 +52,7 @@
     state: present
     apply: true
     namespace: "{{ oc_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   with_items:
     - ../templates/openshift/pipelines/operator-ci-pipeline.yml
 

ansible/roles/operator-pipeline/tasks/webhook-dispatcher.yml

@@ -26,7 +26,7 @@
     state: present
     apply: true
     namespace: "{{ oc_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   loop:
     - ../templates/openshift/webhook_dispatcher/postgres-db-stateful-set.yml
     - ../templates/openshift/webhook_dispatcher/postgres-db-service.yml
@@ -61,14 +61,14 @@
           suffix: "{{ suffix }}"
           env: "{{ env }}"
       data:
-        dispatcher-config.yml: "{{ lookup('template', '{{ operator_pipeline_webhook_dispatcher_config_file }}') }}"
+        dispatcher-config.yml: "{{ lookup('template', operator_pipeline_webhook_dispatcher_config_file) }}"
 
 - name: Deploy webhook dispatcher
   kubernetes.core.k8s:
     state: present
     apply: true
     namespace: "{{ oc_namespace }}"
-    definition: "{{ lookup('template', '{{ item }}') }}"
+    definition: "{{ lookup('template', item) }}"
   loop:
     - "../templates/openshift/webhook_dispatcher/webhook-dispatcher-deployment.yml"
     - "../templates/openshift/webhook_dispatcher/webhook-dispatcher-service.yml"

ansible/roles/operator-pipeline/templates/openshift/webhook_dispatcher/webhook-dispatcher-deployment.yml

@@ -18,7 +18,7 @@ spec:
       labels:
         app: "{{ operator_pipeline_webhook_dispatcher_name }}"
       annotations:
-        checksum/config: "{{ lookup('file', '{{ operator_pipeline_webhook_dispatcher_config_file }}') | checksum }}"
+        checksum/config: "{{ lookup('file', operator_pipeline_webhook_dispatcher_config_file) | checksum }}"
     spec:
       serviceAccountName: "{{ operator_pipeline_webhook_dispatcher_name }}"
       containers: