diff --git a/playbooks/openshift-apps/coreos-koji-tagger.yml b/playbooks/openshift-apps/coreos-koji-tagger.yml index 33e94ca7f1..3abf49a8f7 100644 --- a/playbooks/openshift-apps/coreos-koji-tagger.yml +++ b/playbooks/openshift-apps/coreos-koji-tagger.yml @@ -37,17 +37,17 @@ # Copy in a kerberos config that is unique to fedora infra - role: openshift/object object_app: coreos-koji-tagger - object_template: configmap.yml + object_template: configmap.yml.j2 object_objectname: configmap.yml - role: openshift/object object_app: coreos-koji-tagger - object_template: imagestream.yml + object_template: imagestream.yml.j2 object_objectname: imagestream.yml - role: openshift/object object_app: coreos-koji-tagger - object_template: buildconfig.yml + object_template: buildconfig.yml.j2 object_objectname: buildconfig.yml - role: openshift/start-build @@ -60,7 +60,7 @@ - role: openshift/object object_app: coreos-koji-tagger - object_template: deploymentconfig.yml + object_template: deploymentconfig.yml.j2 object_objectname: deploymentconfig.yml ############################################### diff --git a/playbooks/openshift-apps/coreos-ostree-importer.yml b/playbooks/openshift-apps/coreos-ostree-importer.yml index 45b6537c7e..8f7486927d 100644 --- a/playbooks/openshift-apps/coreos-ostree-importer.yml +++ b/playbooks/openshift-apps/coreos-ostree-importer.yml @@ -73,27 +73,27 @@ # Fedora Messaging config - role: openshift/object object_app: coreos-ostree-importer - object_template: configmap.yml + object_template: configmap.yml.j2 object_objectname: configmap.yml - role: openshift/object object_app: coreos-ostree-importer - object_template: imagestream.yml + object_template: imagestream.yml.j2 object_objectname: imagestream.yml - role: openshift/object object_app: coreos-ostree-importer - object_template: buildconfig.yml + object_template: buildconfig.yml.j2 object_objectname: buildconfig.yml - role: openshift/object object_app: coreos-ostree-importer - object_template: deploymentconfig.yml + object_template: deploymentconfig.yml.j2 object_objectname: deploymentconfig.yml - role: openshift/object object_app: coreos-ostree-importer - object_template: pvc.yml + object_template: pvc.yml.j2 object_objectname: pvc.yml ############################################### diff --git a/roles/openshift-apps/coreos-ci/defaults/main.yaml b/roles/openshift-apps/coreos-ci/defaults/main.yaml index 05311d6641..1e1a05410e 100644 --- a/roles/openshift-apps/coreos-ci/defaults/main.yaml +++ b/roles/openshift-apps/coreos-ci/defaults/main.yaml @@ -5,7 +5,7 @@ project_service_account: coreos-ci-sa appowners: [] ocp_service_account: root project_templates: - - project.yaml - - group.yaml - - rolebinding.yaml - - securitycontextconstraints.yaml + - project.yaml.j2 + - group.yaml.j2 + - rolebinding.yaml.j2 + - securitycontextconstraints.yaml.j2 diff --git a/roles/openshift-apps/coreos-ci/templates/group.yaml b/roles/openshift-apps/coreos-ci/templates/group.yaml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ci/templates/group.yaml rename to roles/openshift-apps/coreos-ci/templates/group.yaml.j2 diff --git a/roles/openshift-apps/coreos-ci/templates/project.yaml b/roles/openshift-apps/coreos-ci/templates/project.yaml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ci/templates/project.yaml rename to roles/openshift-apps/coreos-ci/templates/project.yaml.j2 diff --git a/roles/openshift-apps/coreos-ci/templates/rolebinding.yaml b/roles/openshift-apps/coreos-ci/templates/rolebinding.yaml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ci/templates/rolebinding.yaml rename to roles/openshift-apps/coreos-ci/templates/rolebinding.yaml.j2 diff --git a/roles/openshift-apps/coreos-ci/templates/securitycontextconstraints.yaml b/roles/openshift-apps/coreos-ci/templates/securitycontextconstraints.yaml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ci/templates/securitycontextconstraints.yaml rename to roles/openshift-apps/coreos-ci/templates/securitycontextconstraints.yaml.j2 diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/buildconfig.yml b/roles/openshift-apps/coreos-koji-tagger/templates/buildconfig.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-koji-tagger/templates/buildconfig.yml rename to roles/openshift-apps/coreos-koji-tagger/templates/buildconfig.yml.j2 diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/configmap.yml b/roles/openshift-apps/coreos-koji-tagger/templates/configmap.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-koji-tagger/templates/configmap.yml rename to roles/openshift-apps/coreos-koji-tagger/templates/configmap.yml.j2 diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/deploymentconfig.yml b/roles/openshift-apps/coreos-koji-tagger/templates/deploymentconfig.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-koji-tagger/templates/deploymentconfig.yml rename to roles/openshift-apps/coreos-koji-tagger/templates/deploymentconfig.yml.j2 diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/imagestream.yml b/roles/openshift-apps/coreos-koji-tagger/templates/imagestream.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-koji-tagger/templates/imagestream.yml rename to roles/openshift-apps/coreos-koji-tagger/templates/imagestream.yml.j2 diff --git a/roles/openshift-apps/coreos-ostree-importer/templates/buildconfig.yml b/roles/openshift-apps/coreos-ostree-importer/templates/buildconfig.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ostree-importer/templates/buildconfig.yml rename to roles/openshift-apps/coreos-ostree-importer/templates/buildconfig.yml.j2 diff --git a/roles/openshift-apps/coreos-ostree-importer/templates/configmap.yml b/roles/openshift-apps/coreos-ostree-importer/templates/configmap.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ostree-importer/templates/configmap.yml rename to roles/openshift-apps/coreos-ostree-importer/templates/configmap.yml.j2 diff --git a/roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml b/roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml rename to roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml.j2 diff --git a/roles/openshift-apps/coreos-ostree-importer/templates/imagestream.yml b/roles/openshift-apps/coreos-ostree-importer/templates/imagestream.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ostree-importer/templates/imagestream.yml rename to roles/openshift-apps/coreos-ostree-importer/templates/imagestream.yml.j2 diff --git a/roles/openshift-apps/coreos-ostree-importer/templates/pvc.yml b/roles/openshift-apps/coreos-ostree-importer/templates/pvc.yml.j2 similarity index 100% rename from roles/openshift-apps/coreos-ostree-importer/templates/pvc.yml rename to roles/openshift-apps/coreos-ostree-importer/templates/pvc.yml.j2