From 37b6eb4129da7db0907fe572c21d25ead014da5f Mon Sep 17 00:00:00 2001
From: rmartine <rmartine@redhat.com>
Date: Sun, 29 Jan 2017 19:52:51 -0200
Subject: [PATCH] Fix Openshift Templates

* There was a problem with DeploymentConfig that was missing the correct ImageStream (which should be merged in this file)
* Removing the host attribute from route object to let Openshift create a dynamic hostname for Rocket.Chat
---
 .openshift/rocket-chat-ephemeral.json  | 30 +++++++++++++++++++++++---
 .openshift/rocket-chat-persistent.json | 27 ++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/.openshift/rocket-chat-ephemeral.json b/.openshift/rocket-chat-ephemeral.json
index eca31c5b646..91c43da4c65 100644
--- a/.openshift/rocket-chat-ephemeral.json
+++ b/.openshift/rocket-chat-ephemeral.json
@@ -142,8 +142,33 @@
                         "securityContext": {}
                     }
                 }
+            }
+        },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "rocketchat"
             },
-            "status": {}
+            "spec": {
+                "dockerImageRepository": "docker.io/rocket.chat",
+                "tags": [
+                    {
+                        "name": "latest",
+                        "annotations": {
+                            "description": "Provides a Rocket.Chat application",
+                            "iconClass": "icon-nodejs",
+                            "tags": "rocketchat"
+                        },
+                        "from": {
+                            "kind": "ImageStreamTag",
+                            "name": "latest"
+                        },
+                        "generation": 1,
+                        "importPolicy": {}
+                    }
+                ]
+            }
         },
         {
             "kind": "DeploymentConfig",
@@ -264,7 +289,6 @@
                 }
             },
             "spec": {
-                "host": "rocketchat-rocket-chat.rhel-cdk.10.1.2.2.xip.io",
                 "to": {
                     "kind": "Service",
                     "name": "rocketchat"
@@ -392,4 +416,4 @@
             "required": true
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/.openshift/rocket-chat-persistent.json b/.openshift/rocket-chat-persistent.json
index 28aa8aa04f6..932fc986c0d 100644
--- a/.openshift/rocket-chat-persistent.json
+++ b/.openshift/rocket-chat-persistent.json
@@ -164,6 +164,32 @@
             },
             "status": {}
         },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "rocketchat"
+            },
+            "spec": {
+                "dockerImageRepository": "docker.io/rocket.chat",
+                "tags": [
+                    {
+                        "name": "latest",
+                        "annotations": {
+                            "description": "Provides a Rocket.Chat application",
+                            "iconClass": "icon-nodejs",
+                            "tags": "rocketchat"
+                        },
+                        "from": {
+                            "kind": "ImageStreamTag",
+                            "name": "latest"
+                        },
+                        "generation": 1,
+                        "importPolicy": {}
+                    }
+                ]
+            }
+        },
         {
             "kind": "DeploymentConfig",
             "apiVersion": "v1",
@@ -283,7 +309,6 @@
                 }
             },
             "spec": {
-                "host": "rocketchat-rocket-chat.rhel-cdk.10.1.2.2.xip.io",
                 "to": {
                     "kind": "Service",
                     "name": "rocketchat"