diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index cf2a95de89..72af86871c 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -96,14 +96,14 @@ secret_file_privatefile: "rabbitmq/{{env}}/pki/private/bodhi{{env_suffix}}.key" - role: openshift/object object_app: bodhi - object_template: imagestreams-tagged.yml + object_template: imagestreams-tagged.yml.j2 object_objectname: imagestreams.yml - role: openshift/imagestream imagestream_app: bodhi imagestream_imagename: bodhi-base - role: openshift/object object_app: bodhi - object_template: buildconfig.yml + object_template: buildconfig.yml.j2 object_objectname: buildconfig.yml - role: openshift/start-build start_build_app: bodhi @@ -113,7 +113,7 @@ - build - role: openshift/object object_app: bodhi - object_template_fullpath: "{{roles_path}}/bodhi2/base/templates/configmap.yml" + object_template_fullpath: "{{roles_path}}/bodhi2/base/templates/configmap.yml.j2" object_objectname: configmap.yml - role: openshift/object object_app: bodhi @@ -139,11 +139,11 @@ haproxy.router.openshift.io/timeout: 180s - role: openshift/object object_app: bodhi - object_template: deploymentconfig.yml + object_template: deploymentconfig.yml.j2 object_objectname: deploymentconfig.yml - role: openshift/object object_app: bodhi - object_template: critpathcron.yml + object_template: critpathcron.yml.j2 object_objectname: critpathcron.yml - role: openshift/imagestream imagestream_app: bodhi diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 53972ee6b9..dccfe43624 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -287,7 +287,7 @@ - name: Install logging.yaml 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/bodhi2/base/templates/configmap.yml b/roles/bodhi2/base/templates/configmap.yml.j2 similarity index 97% rename from roles/bodhi2/base/templates/configmap.yml rename to roles/bodhi2/base/templates/configmap.yml.j2 index 1a512efe5c..86ef812801 100644 --- a/roles/bodhi2/base/templates/configmap.yml +++ b/roles/bodhi2/base/templates/configmap.yml.j2 @@ -42,7 +42,7 @@ data: httpd.conf: |- {{ load_file('httpd.conf.j2') | indent }} logging.yaml: |- - {{ load_file('logging.yaml') | indent }} + {{ load_file('logging.yaml.j2') | indent }} production.ini: |- {{ load_file('production.ini.j2') | indent }} celeryconfig.py: |- diff --git a/roles/bodhi2/base/templates/logging.yaml b/roles/bodhi2/base/templates/logging.yaml.j2 similarity index 100% rename from roles/bodhi2/base/templates/logging.yaml rename to roles/bodhi2/base/templates/logging.yaml.j2 diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml.j2 similarity index 100% rename from roles/openshift-apps/bodhi/templates/buildconfig.yml rename to roles/openshift-apps/bodhi/templates/buildconfig.yml.j2 diff --git a/roles/openshift-apps/bodhi/templates/critpathcron.yml b/roles/openshift-apps/bodhi/templates/critpathcron.yml.j2 similarity index 100% rename from roles/openshift-apps/bodhi/templates/critpathcron.yml rename to roles/openshift-apps/bodhi/templates/critpathcron.yml.j2 diff --git a/roles/openshift-apps/bodhi/templates/deploymentconfig.yml b/roles/openshift-apps/bodhi/templates/deploymentconfig.yml.j2 similarity index 100% rename from roles/openshift-apps/bodhi/templates/deploymentconfig.yml rename to roles/openshift-apps/bodhi/templates/deploymentconfig.yml.j2 diff --git a/roles/openshift-apps/bodhi/templates/imagestreams-tagged.yml b/roles/openshift-apps/bodhi/templates/imagestreams-tagged.yml.j2 similarity index 100% rename from roles/openshift-apps/bodhi/templates/imagestreams-tagged.yml rename to roles/openshift-apps/bodhi/templates/imagestreams-tagged.yml.j2