From a6a2e1053930f986a7b09ecb1c0e3c72b17decee Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Wed, 11 Dec 2024 16:33:15 +1000
Subject: [PATCH] openshift roles - rename yml templates to .j2

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
---
 roles/openshift/ipa-client/tasks/main.yml                     | 2 +-
 .../ipa-client/templates/{configmap.yml => configmap.yml.j2}  | 0
 roles/openshift/route/tasks/main.yml                          | 2 +-
 roles/openshift/route/templates/{route.yml => route.yml.j2}   | 0
 roles/openshift/sysadmin-openshift/defaults/main.yaml         | 4 ++--
 .../templates/{group.yaml => group.yaml.j2}                   | 0
 .../templates/{rolebinding.yaml => rolebinding.yaml.j2}       | 0
 roles/yubikey/templates/{configmap.yml => configmap.yml.j2}   | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename roles/openshift/ipa-client/templates/{configmap.yml => configmap.yml.j2} (100%)
 rename roles/openshift/route/templates/{route.yml => route.yml.j2} (100%)
 rename roles/openshift/sysadmin-openshift/templates/{group.yaml => group.yaml.j2} (100%)
 rename roles/openshift/sysadmin-openshift/templates/{rolebinding.yaml => rolebinding.yaml.j2} (100%)
 rename roles/yubikey/templates/{configmap.yml => configmap.yml.j2} (100%)

diff --git a/roles/openshift/ipa-client/tasks/main.yml b/roles/openshift/ipa-client/tasks/main.yml
index 7933cbe816..be7a2fa74f 100644
--- a/roles/openshift/ipa-client/tasks/main.yml
+++ b/roles/openshift/ipa-client/tasks/main.yml
@@ -11,7 +11,7 @@
 
 - name: Copy ipa config template to temporary file
   template:
-    src: "{{roles_path}}/openshift/ipa-client/templates/configmap.yml"
+    src: "{{roles_path}}/openshift/ipa-client/templates/configmap.yml.j2"
     dest: "/etc/openshift_apps/{{ipa_client_app}}/configmap-ipa-client.yml"
   register: ipa_config_result
 
diff --git a/roles/openshift/ipa-client/templates/configmap.yml b/roles/openshift/ipa-client/templates/configmap.yml.j2
similarity index 100%
rename from roles/openshift/ipa-client/templates/configmap.yml
rename to roles/openshift/ipa-client/templates/configmap.yml.j2
diff --git a/roles/openshift/route/tasks/main.yml b/roles/openshift/route/tasks/main.yml
index d3b53be136..bd2a1b72ae 100644
--- a/roles/openshift/route/tasks/main.yml
+++ b/roles/openshift/route/tasks/main.yml
@@ -5,4 +5,4 @@
   vars:
     object_app: "{{route_app}}"
     object_objectname: route-{{route_name}}.yml
-    object_template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml"
+    object_template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml.j2"
diff --git a/roles/openshift/route/templates/route.yml b/roles/openshift/route/templates/route.yml.j2
similarity index 100%
rename from roles/openshift/route/templates/route.yml
rename to roles/openshift/route/templates/route.yml.j2
diff --git a/roles/openshift/sysadmin-openshift/defaults/main.yaml b/roles/openshift/sysadmin-openshift/defaults/main.yaml
index 1677568433..a0b431e2be 100644
--- a/roles/openshift/sysadmin-openshift/defaults/main.yaml
+++ b/roles/openshift/sysadmin-openshift/defaults/main.yaml
@@ -2,5 +2,5 @@
 sysadmin_openshift_appowners: []
 sysadmin_openshift_project_name: sysadmin-openshift
 sysadmin_openshift_project_templates:
-  - group.yaml
-  - rolebinding.yaml
+  - group.yaml.j2
+  - rolebinding.yaml.j2
diff --git a/roles/openshift/sysadmin-openshift/templates/group.yaml b/roles/openshift/sysadmin-openshift/templates/group.yaml.j2
similarity index 100%
rename from roles/openshift/sysadmin-openshift/templates/group.yaml
rename to roles/openshift/sysadmin-openshift/templates/group.yaml.j2
diff --git a/roles/openshift/sysadmin-openshift/templates/rolebinding.yaml b/roles/openshift/sysadmin-openshift/templates/rolebinding.yaml.j2
similarity index 100%
rename from roles/openshift/sysadmin-openshift/templates/rolebinding.yaml
rename to roles/openshift/sysadmin-openshift/templates/rolebinding.yaml.j2
diff --git a/roles/yubikey/templates/configmap.yml b/roles/yubikey/templates/configmap.yml.j2
similarity index 100%
rename from roles/yubikey/templates/configmap.yml
rename to roles/yubikey/templates/configmap.yml.j2