From 649b768595bcf7b54af36ee7a11344a2862ec0de Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Mon, 16 Apr 2018 23:29:18 +0000 Subject: [PATCH] Don't try to bind mount bodhi.py as a directory. Signed-off-by: Randy Barlow --- roles/openshift-apps/bodhi/files/deploymentconfig.yml | 2 +- roles/openshift-apps/bodhi/templates/buildconfig.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/openshift-apps/bodhi/files/deploymentconfig.yml b/roles/openshift-apps/bodhi/files/deploymentconfig.yml index 781650bf6e..10e8f43f17 100644 --- a/roles/openshift-apps/bodhi/files/deploymentconfig.yml +++ b/roles/openshift-apps/bodhi/files/deploymentconfig.yml @@ -43,7 +43,7 @@ items: - name: cache-volume mountPath: /var/cache/bodhi - name: fedmsg-config-volume - mountPath: /etc/fedmsg.d/bodhi-openshift-web.py + mountPath: /etc/bodhi/fedmsg.d readOnly: true - name: fedmsg-key-volume mountPath: /etc/pki/fedmsg/key diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml index 40e0a90fed..ce02831c7f 100644 --- a/roles/openshift-apps/bodhi/templates/buildconfig.yml +++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml @@ -21,6 +21,12 @@ items: {% endif %} RUN dnf install -y bodhi-server python2-gunicorn RUN mv /usr/share/bodhi/bodhi.wsgi /usr/lib/python2.7/site-packages/bodhiwsgi.py + # Put the fedmsg config in place + RUN ln -sf /etc/bodhi/fedmsg.d/bodhi-openshift-web.py /etc/fedmsg.d/bodhi-openshift-web.py + # Put the fedmsg cert and key in place + RUN mkdir -p /etc/pki/fedmsg/ + RUN ln -sf /etc/pki/fedmsg/key/fedmsg-bodhi.key /etc/pki/fedmsg/bodhi.key + RUN ln -sf /etc/pki/fedmsg/crt/fedmsg-bodhi.crt /etc/pki/fedmsg/bodhi.crt EXPOSE 8080 ENV USER=openshift ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- bodhiwsgi