diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index c823bfe3ef..faf26d8dc0 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -15,7 +15,7 @@ appowners: - bowlofeggs - { role: openshift/object, vars: {app: bodhi, file: imagestream.yml }} - - { role: openshift/object, vars: {app: bodhi, file: buildconfig.yml }} + - { role: openshift/object, vars: {app: bodhi, template: buildconfig.yml }} - { role: openshift/start-build, vars: {app: bodhi, name: bodhi-web-build }} - { role: openshift/object, vars: {app: bodhi, template_fullpath: "{{roles_path}}/bodhi2/base/templates/configmap.yml" }} - { role: openshift/object, vars: {app: bodhi, file: service.yml }} diff --git a/roles/openshift-apps/bodhi/files/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml similarity index 81% rename from roles/openshift-apps/bodhi/files/buildconfig.yml rename to roles/openshift-apps/bodhi/templates/buildconfig.yml index ff41980cd2..83c5bca041 100644 --- a/roles/openshift-apps/bodhi/files/buildconfig.yml +++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml @@ -16,6 +16,9 @@ items: vendor="Fedora Infrastructure" \ license="MIT" RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo +{% if env == "staging" %} + RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags-stg.repo +{% endif %} RUN dnf install -y bodhi-server python2-gunicorn RUN mv /usr/share/bodhi/bodhi.wsgi /usr/lib/python2.7/site-packages/bodhiwsgi.py EXPOSE 8080