From 0dbe45565c870a10badca23dda1815829e40c22a Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Mon, 2 Dec 2024 11:22:39 +1000
Subject: [PATCH] webhook2fedmsg - rename templates to .j2

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
---
 playbooks/openshift-apps/webhook2fedmsg.yml                 | 6 +++---
 .../templates/{buildconfig.yml => buildconfig.yml.j2}       | 0
 .../templates/{configmap.yml => configmap.yml.j2}           | 6 +++---
 .../{deploymentconfig.yml => deploymentconfig.yml.j2}       | 0
 .../{fedora-messaging.toml => fedora-messaging.toml.j2}     | 0
 .../templates/{logging.yaml => logging.yaml.j2}             | 0
 .../webhook2fedmsg/templates/{w2fm.cfg => w2fm.cfg.j2}      | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename roles/openshift-apps/webhook2fedmsg/templates/{buildconfig.yml => buildconfig.yml.j2} (100%)
 rename roles/openshift-apps/webhook2fedmsg/templates/{configmap.yml => configmap.yml.j2} (72%)
 rename roles/openshift-apps/webhook2fedmsg/templates/{deploymentconfig.yml => deploymentconfig.yml.j2} (100%)
 rename roles/openshift-apps/webhook2fedmsg/templates/{fedora-messaging.toml => fedora-messaging.toml.j2} (100%)
 rename roles/openshift-apps/webhook2fedmsg/templates/{logging.yaml => logging.yaml.j2} (100%)
 rename roles/openshift-apps/webhook2fedmsg/templates/{w2fm.cfg => w2fm.cfg.j2} (100%)

diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml
index e4a5e3be78..f61e23d7df 100644
--- a/playbooks/openshift-apps/webhook2fedmsg.yml
+++ b/playbooks/openshift-apps/webhook2fedmsg.yml
@@ -71,12 +71,12 @@
 
     - role: openshift/object
       object_app: webhook2fedmsg
-      object_template: buildconfig.yml
+      object_template: buildconfig.yml.j2
       object_objectname: buildconfig.yml
 
     - role: openshift/object
       object_app: webhook2fedmsg
-      object_template: configmap.yml
+      object_template: configmap.yml.j2
       object_objectname: configmap.yml
 
     - role: openshift/object
@@ -110,7 +110,7 @@
     # Deployment config
     - role: openshift/object
       object_app: webhook2fedmsg
-      object_template: deploymentconfig.yml
+      object_template: deploymentconfig.yml.j2
       object_objectname: deploymentconfig.yml
 
   # - role: openshift/start-build
diff --git a/roles/openshift-apps/webhook2fedmsg/templates/buildconfig.yml b/roles/openshift-apps/webhook2fedmsg/templates/buildconfig.yml.j2
similarity index 100%
rename from roles/openshift-apps/webhook2fedmsg/templates/buildconfig.yml
rename to roles/openshift-apps/webhook2fedmsg/templates/buildconfig.yml.j2
diff --git a/roles/openshift-apps/webhook2fedmsg/templates/configmap.yml b/roles/openshift-apps/webhook2fedmsg/templates/configmap.yml.j2
similarity index 72%
rename from roles/openshift-apps/webhook2fedmsg/templates/configmap.yml
rename to roles/openshift-apps/webhook2fedmsg/templates/configmap.yml.j2
index 0d09675356..0227231ad6 100644
--- a/roles/openshift-apps/webhook2fedmsg/templates/configmap.yml
+++ b/roles/openshift-apps/webhook2fedmsg/templates/configmap.yml.j2
@@ -12,9 +12,9 @@ items:
       app: webhook2fedmsg
   data:
     webhook-to-fedora-messaging.cfg: |-
-      {{ load_file('w2fm.cfg') | indent(6) }}
+      {{ load_file('w2fm.cfg.j2') | indent(6) }}
     logging.yaml: |-
-      {{ load_file('logging.yaml') | indent(6) }}
+      {{ load_file('logging.yaml.j2') | indent(6) }}
 - apiVersion: v1
   kind: ConfigMap
   metadata:
@@ -23,4 +23,4 @@ items:
       app: webhook2fedmsg
   data:
     config.toml: |-
-      {{ load_file('fedora-messaging.toml') | indent(6) }}
+      {{ load_file('fedora-messaging.toml.j2') | indent(6) }}
diff --git a/roles/openshift-apps/webhook2fedmsg/templates/deploymentconfig.yml b/roles/openshift-apps/webhook2fedmsg/templates/deploymentconfig.yml.j2
similarity index 100%
rename from roles/openshift-apps/webhook2fedmsg/templates/deploymentconfig.yml
rename to roles/openshift-apps/webhook2fedmsg/templates/deploymentconfig.yml.j2
diff --git a/roles/openshift-apps/webhook2fedmsg/templates/fedora-messaging.toml b/roles/openshift-apps/webhook2fedmsg/templates/fedora-messaging.toml.j2
similarity index 100%
rename from roles/openshift-apps/webhook2fedmsg/templates/fedora-messaging.toml
rename to roles/openshift-apps/webhook2fedmsg/templates/fedora-messaging.toml.j2
diff --git a/roles/openshift-apps/webhook2fedmsg/templates/logging.yaml b/roles/openshift-apps/webhook2fedmsg/templates/logging.yaml.j2
similarity index 100%
rename from roles/openshift-apps/webhook2fedmsg/templates/logging.yaml
rename to roles/openshift-apps/webhook2fedmsg/templates/logging.yaml.j2
diff --git a/roles/openshift-apps/webhook2fedmsg/templates/w2fm.cfg b/roles/openshift-apps/webhook2fedmsg/templates/w2fm.cfg.j2
similarity index 100%
rename from roles/openshift-apps/webhook2fedmsg/templates/w2fm.cfg
rename to roles/openshift-apps/webhook2fedmsg/templates/w2fm.cfg.j2