From 6b367d3a10e69146116131c24550cd7d95752439 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Wed, 11 Oct 2017 09:19:41 +1000 Subject: [PATCH] greenwave role: mount to /etc/fedmsg-greenwave.d for the fedmsg consumers container This will allow us to extend the default configuration provided with the rpm instead of overriding it. --- roles/openshift-apps/greenwave/files/deploymentconfig.yml | 2 +- roles/openshift-apps/greenwave/templates/buildconfig.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/greenwave/files/deploymentconfig.yml b/roles/openshift-apps/greenwave/files/deploymentconfig.yml index 768d12804e..019da950cf 100644 --- a/roles/openshift-apps/greenwave/files/deploymentconfig.yml +++ b/roles/openshift-apps/greenwave/files/deploymentconfig.yml @@ -83,7 +83,7 @@ spec: - '/usr/bin/fedmsg-hub' volumeMounts: - name: fedmsg-config-volume - mountPath: /etc/fedmsg.d + mountPath: /etc/fedmsg-greenwave.d readOnly: true resources: limits: diff --git a/roles/openshift-apps/greenwave/templates/buildconfig.yml b/roles/openshift-apps/greenwave/templates/buildconfig.yml index 465253aef2..060b698f05 100644 --- a/roles/openshift-apps/greenwave/templates/buildconfig.yml +++ b/roles/openshift-apps/greenwave/templates/buildconfig.yml @@ -13,7 +13,6 @@ spec: name="Greenwave" \ vendor="Fedora Infrastructure" \ license="MIT" - RUN dnf -y clean all RUN dnf -v -y install --setopt=tsflags=nodocs \ python-gunicorn \ python-requests \ @@ -22,6 +21,8 @@ spec: python2-flask RUN dnf -v -y install --setopt=tsflags=nodocs \ https://kojipkgs.fedoraproject.org//packages/greenwave/0.3/1.fc26/noarch/greenwave-0.3-1.fc26.noarch.rpm + # create a symlink for configuring the fedmsg consumers. + RUN ln -sfn /etc/fedmsg-greenwave.d/greenwave.py /etc/fedmsg.d/greenwave.py EXPOSE 8080 ENTRYPOINT gunicorn --bind 0.0.0.0:8080 --access-logfile=- greenwave.wsgi:app strategy: