From a0cd459d47470d9f7d25290e7396c1d1e4c9ed6a Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Wed, 15 Jan 2025 19:44:59 +1000 Subject: [PATCH] Fix some references in tasks dropping .j2 When fixing conflicts when merging the PR containing commit 47c68f4, some of the .j2 suffuxes i added in tasks were erronounusly dropped. this fixes those. Signed-off-by: Ryan Lerch --- roles/bodhi2/backend/tasks/main.yml | 2 +- roles/openshift-apps/firmitas/tasks/create-buildconfig.yml | 2 +- roles/openshift-apps/firmitas/tasks/create-cronjob.yml | 2 +- roles/openshift-apps/firmitas/tasks/create-deployment.yml | 2 +- .../firmitas/tasks/create-firmitas-configuration-secret.yml | 2 +- roles/openshift-apps/firmitas/tasks/create-imagestream.yml | 2 +- roles/openshift-apps/firmitas/tasks/create-namespace.yml | 2 +- .../firmitas/tasks/create-pagure-apikey-secret.yml | 2 +- .../firmitas/tasks/create-persistent-volume-claim.yml | 2 +- roles/openshift/ipa-client/tasks/main.yml | 2 +- roles/openshift/project/tasks/main.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index ebc8855783..a6fd6d2015 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -287,7 +287,7 @@ - name: Install logging.yaml ansible.builtin.template: > - src="{{ roles_path }}/bodhi2/base/templates/logging.yaml" + src="{{ roles_path }}/bodhi2/base/templates/logging.yaml.j2" dest="/etc/bodhi/logging.yaml" owner=apache group=apache diff --git a/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml b/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml index 83437a40f3..389a2dfd82 100644 --- a/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml +++ b/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml @@ -2,7 +2,7 @@ # generate the templates for project to be created - name: Create the buildconfig template ansible.builtin.template: - src: "buildconfig.yml" + src: "buildconfig.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/buildconfig.yml" mode: "0770" diff --git a/roles/openshift-apps/firmitas/tasks/create-cronjob.yml b/roles/openshift-apps/firmitas/tasks/create-cronjob.yml index 80f61077e1..5575f1b28e 100644 --- a/roles/openshift-apps/firmitas/tasks/create-cronjob.yml +++ b/roles/openshift-apps/firmitas/tasks/create-cronjob.yml @@ -2,7 +2,7 @@ # generate the templates for project to be created - name: Create the cronjob template ansible.builtin.template: - src: "cronjob.yml" + src: "cronjob.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/cronjob.yml" mode: "0770" diff --git a/roles/openshift-apps/firmitas/tasks/create-deployment.yml b/roles/openshift-apps/firmitas/tasks/create-deployment.yml index f00f9b2418..bae47a5133 100644 --- a/roles/openshift-apps/firmitas/tasks/create-deployment.yml +++ b/roles/openshift-apps/firmitas/tasks/create-deployment.yml @@ -2,7 +2,7 @@ # generate the templates for project to be created - name: Create the deployment template ansible.builtin.template: - src: "deployment.yml" + src: "deployment.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/deployment.yml" mode: "0770" diff --git a/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml b/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml index 7de1c2eb16..be30c9c800 100644 --- a/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml +++ b/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml @@ -36,7 +36,7 @@ # generate the templates for project to be created - name: Copy the templates to the host ansible.builtin.template: - src: "secret-configuration.yml" + src: "secret-configuration.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/secret-configuration.yml" mode: "0600" diff --git a/roles/openshift-apps/firmitas/tasks/create-imagestream.yml b/roles/openshift-apps/firmitas/tasks/create-imagestream.yml index eca06ecad3..0ceaf9ac25 100644 --- a/roles/openshift-apps/firmitas/tasks/create-imagestream.yml +++ b/roles/openshift-apps/firmitas/tasks/create-imagestream.yml @@ -2,7 +2,7 @@ # generate the templates for project to be created - name: Create the imagestream template ansible.builtin.template: - src: "imagestream.yml" + src: "imagestream.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/imagestream.yml" mode: "0770" diff --git a/roles/openshift-apps/firmitas/tasks/create-namespace.yml b/roles/openshift-apps/firmitas/tasks/create-namespace.yml index 7ddd909491..4fbd36181f 100644 --- a/roles/openshift-apps/firmitas/tasks/create-namespace.yml +++ b/roles/openshift-apps/firmitas/tasks/create-namespace.yml @@ -2,7 +2,7 @@ # generate the templates for project to be created - name: Create the namespace template ansible.builtin.template: - src: "namespace.yml" + src: "namespace.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/namespace.yml" mode: "0770" diff --git a/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml b/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml index 6e0ac787c3..136a922b55 100644 --- a/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml +++ b/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml @@ -2,7 +2,7 @@ # generate the templates for project to be created - name: Create the pagure api secret template ansible.builtin.template: - src: "secret-pagure-apikey.yml" + src: "secret-pagure-apikey.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/secret-pagure-apikey.yml" mode: "0770" diff --git a/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml b/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml index 9fcd038bb9..bb164e4b10 100644 --- a/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml +++ b/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml @@ -2,7 +2,7 @@ # generate the templates for project to be created - name: Create the persistent volume template ansible.builtin.template: - src: "persistent-volume-claim.yml" + src: "persistent-volume-claim.yml.j2" dest: "/root/ocp4/openshift-apps/firmitas/persistent-volume-claim.yml" mode: "0770" diff --git a/roles/openshift/ipa-client/tasks/main.yml b/roles/openshift/ipa-client/tasks/main.yml index f7175046e3..0bd7cbf48c 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 ansible.builtin.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/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml index 06fb98add5..3fd8febd73 100644 --- a/roles/openshift/project/tasks/main.yml +++ b/roles/openshift/project/tasks/main.yml @@ -15,7 +15,7 @@ - name: Copy project template ansible.builtin.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