From 098a9fedf2e16c5b5f5a9819dfa5869f1ba0b882 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Mon, 9 Dec 2024 14:43:14 +1000 Subject: [PATCH] openshift/project - rename yaml/yml templates to .j2 Signed-off-by: Ryan Lerch --- roles/openshift/project/defaults/main.yml | 2 +- roles/openshift/project/tasks/main.yml | 16 ++++++++-------- .../{alertmanager.yml => alertmanager.yml.j2} | 0 .../{appowners.yml => appowners.yml.j2} | 0 .../templates/{deployer.yml => deployer.yml.j2} | 0 .../{egresspolicy.yml => egresspolicy.yml.j2} | 0 .../{imagebuilder.yml => imagebuilder.yml.j2} | 0 .../{imagepuller.yml => imagepuller.yml.j2} | 0 .../templates/{project.yml => project.yml.j2} | 0 ...rometheusRules.yml => prometheusRules.yml.j2} | 2 +- ...{role-appowners.yml => role-appowners.yml.j2} | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename roles/openshift/project/templates/{alertmanager.yml => alertmanager.yml.j2} (100%) rename roles/openshift/project/templates/{appowners.yml => appowners.yml.j2} (100%) rename roles/openshift/project/templates/{deployer.yml => deployer.yml.j2} (100%) rename roles/openshift/project/templates/{egresspolicy.yml => egresspolicy.yml.j2} (100%) rename roles/openshift/project/templates/{imagebuilder.yml => imagebuilder.yml.j2} (100%) rename roles/openshift/project/templates/{imagepuller.yml => imagepuller.yml.j2} (100%) rename roles/openshift/project/templates/{project.yml => project.yml.j2} (100%) rename roles/openshift/project/templates/{prometheusRules.yml => prometheusRules.yml.j2} (97%) rename roles/openshift/project/templates/{role-appowners.yml => role-appowners.yml.j2} (100%) diff --git a/roles/openshift/project/defaults/main.yml b/roles/openshift/project/defaults/main.yml index 90984122b7..ac1ed1c30c 100644 --- a/roles/openshift/project/defaults/main.yml +++ b/roles/openshift/project/defaults/main.yml @@ -3,7 +3,7 @@ project_allow_fas_db: false project_allow_iad2: true project_allow_pod_creation: false -egress_policy_template: "{{roles_path}}/openshift/project/templates/egresspolicy.yml" +egress_policy_template: "{{roles_path}}/openshift/project/templates/egresspolicy.yml.j2" project_alerting: true project_alert_rules: diff --git a/roles/openshift/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml index 61665eafa7..4b55db69e1 100644 --- a/roles/openshift/project/tasks/main.yml +++ b/roles/openshift/project/tasks/main.yml @@ -15,7 +15,7 @@ - name: Copy project template template: - src="{{roles_path}}/openshift/project/templates/project.yml" + src="{{roles_path}}/openshift/project/templates/project.yml.j2" dest=/etc/openshift_apps/{{project_app}}/project.yml - name: Create project @@ -28,7 +28,7 @@ vars: object_app: "{{project_app}}" object_objectname: deployer.yml - object_template_fullpath: "{{roles_path}}/openshift/project/templates/deployer.yml" + object_template_fullpath: "{{roles_path}}/openshift/project/templates/deployer.yml.j2" - name: imagebuilder.yml include_role: @@ -36,7 +36,7 @@ vars: object_app: "{{project_app}}" object_objectname: imagebuilder.yml - object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagebuilder.yml" + object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagebuilder.yml.j2" - name: imagepuller.yml include_role: @@ -44,7 +44,7 @@ vars: object_app: "{{project_app}}" object_objectname: imagepuller.yml - object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagepuller.yml" + object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagepuller.yml.j2" - name: role-appowners.yml include_role: @@ -52,7 +52,7 @@ vars: object_app: "{{project_app}}" object_objectname: role-appowners.yml - object_template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml" + object_template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml.j2" - name: appowners.yml include_role: @@ -60,7 +60,7 @@ vars: object_app: "{{project_app}}" object_objectname: appowners.yml - object_template_fullpath: "{{roles_path}}/openshift/project/templates/appowners.yml" + object_template_fullpath: "{{roles_path}}/openshift/project/templates/appowners.yml.j2" - name: alertmanager.yml include_role: @@ -68,7 +68,7 @@ vars: object_app: "{{project_app}}" object_objectname: alertmanager.yml - object_template_fullpath: "{{roles_path}}/openshift/project/templates/alertmanager.yml" + object_template_fullpath: "{{roles_path}}/openshift/project/templates/alertmanager.yml.j2" - name: prometheusRules.yml include_role: @@ -76,5 +76,5 @@ vars: object_app: "{{project_app}}" object_objectname: prometheusRules.yml - object_template_fullpath: "{{roles_path}}/openshift/project/templates/prometheusRules.yml" + object_template_fullpath: "{{roles_path}}/openshift/project/templates/prometheusRules.yml.j2" when: project_alerting diff --git a/roles/openshift/project/templates/alertmanager.yml b/roles/openshift/project/templates/alertmanager.yml.j2 similarity index 100% rename from roles/openshift/project/templates/alertmanager.yml rename to roles/openshift/project/templates/alertmanager.yml.j2 diff --git a/roles/openshift/project/templates/appowners.yml b/roles/openshift/project/templates/appowners.yml.j2 similarity index 100% rename from roles/openshift/project/templates/appowners.yml rename to roles/openshift/project/templates/appowners.yml.j2 diff --git a/roles/openshift/project/templates/deployer.yml b/roles/openshift/project/templates/deployer.yml.j2 similarity index 100% rename from roles/openshift/project/templates/deployer.yml rename to roles/openshift/project/templates/deployer.yml.j2 diff --git a/roles/openshift/project/templates/egresspolicy.yml b/roles/openshift/project/templates/egresspolicy.yml.j2 similarity index 100% rename from roles/openshift/project/templates/egresspolicy.yml rename to roles/openshift/project/templates/egresspolicy.yml.j2 diff --git a/roles/openshift/project/templates/imagebuilder.yml b/roles/openshift/project/templates/imagebuilder.yml.j2 similarity index 100% rename from roles/openshift/project/templates/imagebuilder.yml rename to roles/openshift/project/templates/imagebuilder.yml.j2 diff --git a/roles/openshift/project/templates/imagepuller.yml b/roles/openshift/project/templates/imagepuller.yml.j2 similarity index 100% rename from roles/openshift/project/templates/imagepuller.yml rename to roles/openshift/project/templates/imagepuller.yml.j2 diff --git a/roles/openshift/project/templates/project.yml b/roles/openshift/project/templates/project.yml.j2 similarity index 100% rename from roles/openshift/project/templates/project.yml rename to roles/openshift/project/templates/project.yml.j2 diff --git a/roles/openshift/project/templates/prometheusRules.yml b/roles/openshift/project/templates/prometheusRules.yml.j2 similarity index 97% rename from roles/openshift/project/templates/prometheusRules.yml rename to roles/openshift/project/templates/prometheusRules.yml.j2 index 150a2e89ae..f16704e4e3 100644 --- a/roles/openshift/project/templates/prometheusRules.yml +++ b/roles/openshift/project/templates/prometheusRules.yml.j2 @@ -1,4 +1,4 @@ -#jinja2:variable_start_string:'@@',variable_end_string:'@@' +# jinja2:variable_start_string:'@@',variable_end_string:'@@' --- apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule diff --git a/roles/openshift/project/templates/role-appowners.yml b/roles/openshift/project/templates/role-appowners.yml.j2 similarity index 100% rename from roles/openshift/project/templates/role-appowners.yml rename to roles/openshift/project/templates/role-appowners.yml.j2