From 338e9668b06c245af29746d6469803f2914aabe4 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Wed, 15 May 2019 10:48:17 +0000
Subject: Fix Message Router ports in robot test suite

https://gerrit.onap.org/r/c/86515/ disabled the use of HTTP ports in
Message Router by default and so 3904 is not there on a fresh install.
This commit change the use of default message router port and scheme in
robot testsuite

Change-Id: I92d267b9482c21606fb9b437f6c64a18f044184a
Issue-ID: DMAAP-1152
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
---
 .../dmaap/components/dmaap-dr-node/templates/post-install-job.yaml      | 2 ++
 .../dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml      | 2 ++
 .../dmaap/components/message-router/templates/post-install-job.yaml     | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'kubernetes/dmaap')

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
index 096b51c094..92349b8bf2 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "60"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
 
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
index 8a2cf692b8..e411b2b4e7 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "30"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
 
diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
index 6d246de87f..b6f75d57cd 100644
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "30"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
         volumeMounts:
-- 
cgit 1.2.3-korg