From b28dfa4115d750be68f14a41cea0fba1bcc089e7 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Mon, 9 Dec 2024 14:11:38 +1000 Subject: [PATCH] mirrormanager - rename yaml/yml templates to .j2 Signed-off-by: Ryan Lerch --- playbooks/openshift-apps/mirrormanager.yml | 20 +++++++++---------- .../templates/{_macros.yml => _macros.yml.j2} | 0 .../{buildconfig.yml => buildconfig.yml.j2} | 0 .../{configmap.yml => configmap.yml.j2} | 0 ...cron-accesses.yml => cron-accesses.yml.j2} | 2 +- .../{cron-crawler.yml => cron-crawler.yml.j2} | 2 +- .../{cron-geoip.yml => cron-geoip.yml.j2} | 2 +- ...cache.yml => cron-mirrorlist-cache.yml.j2} | 2 +- ...-mirror.yml => cron-primary-mirror.yml.j2} | 2 +- ...ropagation.yml => cron-propagation.yml.j2} | 2 +- ...mentconfig.yml => deploymentconfig.yml.j2} | 2 +- .../templates/{job.yml => job.yml.j2} | 2 +- .../templates/{secrets.yml => secrets.yml.j2} | 0 13 files changed, 18 insertions(+), 18 deletions(-) rename roles/openshift-apps/mirrormanager/templates/{_macros.yml => _macros.yml.j2} (100%) rename roles/openshift-apps/mirrormanager/templates/{buildconfig.yml => buildconfig.yml.j2} (100%) rename roles/openshift-apps/mirrormanager/templates/{configmap.yml => configmap.yml.j2} (100%) rename roles/openshift-apps/mirrormanager/templates/{cron-accesses.yml => cron-accesses.yml.j2} (95%) rename roles/openshift-apps/mirrormanager/templates/{cron-crawler.yml => cron-crawler.yml.j2} (97%) rename roles/openshift-apps/mirrormanager/templates/{cron-geoip.yml => cron-geoip.yml.j2} (96%) rename roles/openshift-apps/mirrormanager/templates/{cron-mirrorlist-cache.yml => cron-mirrorlist-cache.yml.j2} (96%) rename roles/openshift-apps/mirrormanager/templates/{cron-primary-mirror.yml => cron-primary-mirror.yml.j2} (93%) rename roles/openshift-apps/mirrormanager/templates/{cron-propagation.yml => cron-propagation.yml.j2} (95%) rename roles/openshift-apps/mirrormanager/templates/{deploymentconfig.yml => deploymentconfig.yml.j2} (94%) rename roles/openshift-apps/mirrormanager/templates/{job.yml => job.yml.j2} (91%) rename roles/openshift-apps/mirrormanager/templates/{secrets.yml => secrets.yml.j2} (100%) diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index 12d6149341..21e5900e68 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -63,7 +63,7 @@ - role: openshift/object object_app: mirrormanager - object_template: buildconfig.yml + object_template: buildconfig.yml.j2 object_objectname: buildconfig.yml - role: openshift/object @@ -73,12 +73,12 @@ - role: openshift/object object_app: mirrormanager - object_template: secrets.yml + object_template: secrets.yml.j2 object_objectname: secrets.yml - role: openshift/object object_app: mirrormanager - object_template: configmap.yml + object_template: configmap.yml.j2 object_objectname: configmap.yml - role: openshift/object @@ -133,35 +133,35 @@ # Deployment config - role: openshift/object object_app: mirrormanager - object_template: deploymentconfig.yml + object_template: deploymentconfig.yml.j2 object_objectname: deploymentconfig.yml # Cron jobs - role: openshift/object object_app: mirrormanager - object_template: cron-crawler.yml + object_template: cron-crawler.yml.j2 object_objectname: cron-crawler.yml when: env == "production" - role: openshift/object object_app: mirrormanager - object_template: cron-propagation.yml + object_template: cron-propagation.yml.j2 object_objectname: cron-propagation.yml when: env == "production" - role: openshift/object object_app: mirrormanager - object_template: cron-accesses.yml + object_template: cron-accesses.yml.j2 object_objectname: cron-accesses.yml - role: openshift/object object_app: mirrormanager - object_template: cron-mirrorlist-cache.yml + object_template: cron-mirrorlist-cache.yml.j2 object_objectname: cron-mirrorlist-cache.yml - role: openshift/object object_app: mirrormanager - object_template: cron-geoip.yml + object_template: cron-geoip.yml.j2 object_objectname: cron-geoip.yml - role: openshift/object object_app: mirrormanager - object_template: cron-primary-mirror.yml + object_template: cron-primary-mirror.yml.j2 object_objectname: cron-primary-mirror.yml - role: openshift/start-build diff --git a/roles/openshift-apps/mirrormanager/templates/_macros.yml b/roles/openshift-apps/mirrormanager/templates/_macros.yml.j2 similarity index 100% rename from roles/openshift-apps/mirrormanager/templates/_macros.yml rename to roles/openshift-apps/mirrormanager/templates/_macros.yml.j2 diff --git a/roles/openshift-apps/mirrormanager/templates/buildconfig.yml b/roles/openshift-apps/mirrormanager/templates/buildconfig.yml.j2 similarity index 100% rename from roles/openshift-apps/mirrormanager/templates/buildconfig.yml rename to roles/openshift-apps/mirrormanager/templates/buildconfig.yml.j2 diff --git a/roles/openshift-apps/mirrormanager/templates/configmap.yml b/roles/openshift-apps/mirrormanager/templates/configmap.yml.j2 similarity index 100% rename from roles/openshift-apps/mirrormanager/templates/configmap.yml rename to roles/openshift-apps/mirrormanager/templates/configmap.yml.j2 diff --git a/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml b/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml.j2 similarity index 95% rename from roles/openshift-apps/mirrormanager/templates/cron-accesses.yml rename to roles/openshift-apps/mirrormanager/templates/cron-accesses.yml.j2 index 0bd9ab4555..4e439f060a 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-accesses.yml.j2 @@ -1,4 +1,4 @@ -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env %} +{% from "_macros.yml.j2" import common_volume_mounts, common_volumes, common_env %} --- apiVersion: batch/v1 kind: CronJob diff --git a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml.j2 similarity index 97% rename from roles/openshift-apps/mirrormanager/templates/cron-crawler.yml rename to roles/openshift-apps/mirrormanager/templates/cron-crawler.yml.j2 index 0b45027cf3..ba0ed984f0 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml.j2 @@ -1,7 +1,7 @@ # ### Crawler cron jobs # -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} +{% from "_macros.yml.j2" import common_volume_mounts, common_volumes, common_env, security_context with context %} {% for cronjob in mirrormanager_cron_crawler %} --- # Category: {{ cronjob.category }} diff --git a/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml b/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml.j2 similarity index 96% rename from roles/openshift-apps/mirrormanager/templates/cron-geoip.yml rename to roles/openshift-apps/mirrormanager/templates/cron-geoip.yml.j2 index 102762b9f9..797949de69 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml.j2 @@ -1,4 +1,4 @@ -{% from "_macros.yml" import security_context with context %} +{% from "_macros.yml.j2" import security_context with context %} --- # Download GeoIP database apiVersion: batch/v1 diff --git a/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml b/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml.j2 similarity index 96% rename from roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml rename to roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml.j2 index f2fef16ee6..9b305f3b50 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml.j2 @@ -1,4 +1,4 @@ -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} +{% from "_macros.yml.j2" import common_volume_mounts, common_volumes, common_env, security_context with context %} --- apiVersion: batch/v1 kind: CronJob diff --git a/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml b/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml.j2 similarity index 93% rename from roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml rename to roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml.j2 index 31e12502e6..8451183381 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml.j2 @@ -1,6 +1,6 @@ ### Primary mirror scanning cron jobs # -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} +{% from "_macros.yml.j2" import common_volume_mounts, common_volumes, common_env, security_context with context %} {% for cronjob in mirrormanager_cron_primary_mirror %} --- # Category: {{ cronjob.category }} diff --git a/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml b/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml.j2 similarity index 95% rename from roles/openshift-apps/mirrormanager/templates/cron-propagation.yml rename to roles/openshift-apps/mirrormanager/templates/cron-propagation.yml.j2 index 3b0425f289..a179fc1218 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml.j2 @@ -1,7 +1,7 @@ # # Propagation checks # -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} +{% from "_macros.yml.j2" import common_volume_mounts, common_volumes, common_env, security_context with context %} --- apiVersion: batch/v1 kind: CronJob diff --git a/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml b/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml.j2 similarity index 94% rename from roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml rename to roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml.j2 index e5a6c83bab..a16d2f3097 100644 --- a/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml +++ b/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml.j2 @@ -1,4 +1,4 @@ -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} +{% from "_macros.yml.j2" import common_volume_mounts, common_volumes, common_env, security_context with context %} --- apiVersion: apps.openshift.io/v1 kind: DeploymentConfig diff --git a/roles/openshift-apps/mirrormanager/templates/job.yml b/roles/openshift-apps/mirrormanager/templates/job.yml.j2 similarity index 91% rename from roles/openshift-apps/mirrormanager/templates/job.yml rename to roles/openshift-apps/mirrormanager/templates/job.yml.j2 index cb51a7bea3..4ab7f72ab0 100644 --- a/roles/openshift-apps/mirrormanager/templates/job.yml +++ b/roles/openshift-apps/mirrormanager/templates/job.yml.j2 @@ -1,4 +1,4 @@ -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} +{% from "_macros.yml.j2" import common_volume_mounts, common_volumes, common_env, security_context with context %} # A template for manual commands --- apiVersion: batch/v1 diff --git a/roles/openshift-apps/mirrormanager/templates/secrets.yml b/roles/openshift-apps/mirrormanager/templates/secrets.yml.j2 similarity index 100% rename from roles/openshift-apps/mirrormanager/templates/secrets.yml rename to roles/openshift-apps/mirrormanager/templates/secrets.yml.j2