From 052d03c056183a645a07172e02749baadeec79cb Mon Sep 17 00:00:00 2001
From: Akshay Jagadish <akshay.jagadish@connectus.ai>
Date: Wed, 18 Nov 2020 13:59:19 -0500
Subject: [PATCH] Grouped env variables and seperated port/address fields for
 opensync-externalhost

---
 .../templates/deployment.yaml                 | 12 +++++-----
 tip-wlan/charts/opensync-gw-cloud/values.yaml | 23 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml b/tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml
index dc28fed..c565384 100644
--- a/tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml
@@ -176,7 +176,9 @@ spec:
           env:
             {{- include "common.env" . | nindent 12 }}
             - name: OVSDB_MANAGER
-              value: {{ .Values.externalhostaddress.ovsdb }}
+              value: {{ .Values.externalhost.address.ovsdb }}
+            - name: OVSDB_EXTERNAL_PORT
+              value: "{{ .Values.externalhost.ports.ovsdb }}"
             - name: OVSDB_MANAGER_IP
               valueFrom:
                 fieldRef:
@@ -184,7 +186,9 @@ spec:
             - name: MQTT_SERVER_INTERNAL
               value: {{ .Release.Name }}-{{ .Values.mqtt.url }}
             - name: MQTT_SERVER_EXTERNAL
-              value: {{ .Values.externalhostaddress.mqtt }}
+              value: {{ .Values.externalhost.address.mqtt }}
+            - name: MQTT_BROKER_EXTERNAL_PORT
+              value: "{{ .Values.externalhost.ports.mqtt }}"
             {{- if .Values.global.integratedDeployment }}
             - name: INTEGRATED_SERVER
               value: {{ .Release.Name }}-{{ .Values.integratedcloudcomponent.url }}
@@ -206,10 +210,6 @@ spec:
               value: {{ .Values.ethernetType.wanType }}
             - name: DEFAULT_WAN_NAME
               value: {{ .Values.ethernetType.wanName }}
-            - name: MQTT_BROKER_EXTERNAL_PORT
-              value: "{{ .Values.externalhostports.mqtt }}"
-            - name: OVSDB_EXTERNAL_PORT
-              value: "{{ .Values.externalhostports.ovsdb }}"
           volumeMounts:
           - mountPath: /opt/tip-wlan/certs/client_keystore.jks
             name: certificates
diff --git a/tip-wlan/charts/opensync-gw-cloud/values.yaml b/tip-wlan/charts/opensync-gw-cloud/values.yaml
index 94fb042..ad74f2f 100644
--- a/tip-wlan/charts/opensync-gw-cloud/values.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/values.yaml
@@ -113,19 +113,20 @@ portal:
       name: file-store-data
       ordinal: 0
 
- # These are list of external HostAddresses for ovsdb, mqtt. 
- # This is important for ovsdb and mqtt since 
- # that's what AP sees. Please make sure to override
- # them in dev override file for your respective environments.
-externalhostaddress:
-  ovsdb: opensync-gw-cloud
-  mqtt: opensync-mqtt-broker
 
-# These are the ports for the externalhostaddress
+# These are the address and ports for the externalhost
+# This is important for ovsdb and mqtt since 
+# that's what AP sees. Please make sure to override
+# them in dev override file for your respective environments.
 # the default values below would be used if not overriden
-externalhostports:
-  ovsdb: 6640
-  mqtt: 1883
+externalhost:
+  address:
+    ovsdb: opensync-gw-cloud
+    mqtt: opensync-mqtt-broker
+  ports:
+    ovsdb: 6640
+    mqtt: 1883
+
 
 
 ethernetType: