From 3b40eb13634e6b2c58c98b7bf0ade1903a7e5d6b Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Mon, 2 Jul 2018 12:24:59 +1000
Subject: [PATCH] greenwave: use fedmsg-hub-3 instead of fedmsg-hub as the
 entrypoint

Greenwave 0.8+ has switched to Python 3, which means the fedmsg-hub
command for the fedmsg-consumers pod has to be fedmsg-hub-3 now.

This is in staging only for now.
---
 playbooks/openshift-apps/greenwave.yml                        | 2 +-
 .../greenwave/{files => templates}/deploymentconfig.yml       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename roles/openshift-apps/greenwave/{files => templates}/deploymentconfig.yml (97%)

diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index 1069ff8444..9d704bf4f4 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -71,7 +71,7 @@
     objectname: route.yml
   - role: openshift/object
     app: greenwave
-    file: deploymentconfig.yml
+    template: deploymentconfig.yml
     objectname: deploymentconfig.yml
   - role: openshift/rollout
     app: greenwave
diff --git a/roles/openshift-apps/greenwave/files/deploymentconfig.yml b/roles/openshift-apps/greenwave/templates/deploymentconfig.yml
similarity index 97%
rename from roles/openshift-apps/greenwave/files/deploymentconfig.yml
rename to roles/openshift-apps/greenwave/templates/deploymentconfig.yml
index 3af774541c..4a635ff990 100644
--- a/roles/openshift-apps/greenwave/files/deploymentconfig.yml
+++ b/roles/openshift-apps/greenwave/templates/deploymentconfig.yml
@@ -80,7 +80,11 @@ spec:
         ports:
         - containerPort: 8081
         command:
+{% if env == 'staging' %}
+        - '/usr/bin/fedmsg-hub-3'
+{% else %}
         - '/usr/bin/fedmsg-hub'
+{% endif %}
         volumeMounts:
         - name: config-volume
           mountPath: /etc/greenwave