Fixes for SDNC portal pod

With these changes, the SDNC Portal pod is now coming up cleanly and there
are no errors in the logs.  I was able to successfully create a user and log
in to the portal.

Change-Id: Iab3374c585a0b88844e83860d14e572e151958a6
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: OOM-881

7 files changed, 29 insertions, 14 deletions

diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
index 4c0754b691..afd872129a 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
@@ -3,7 +3,7 @@
   "dbConnLimit": "100",
   "home": "/opt/admportal",
   "sslEnabled": "false",
-  "nonSslPort": "8843",
+  "nonSslPort": "{{.Values.service.internalPort}}",
   "ConexusNetworkPort": "8443",
   "AppNetworkPort": "8543",
   "clusterPort": "8443",
@@ -25,9 +25,9 @@
     "docker0": "172.17.0.1",
     "virbr0": "192.168.122.1"
   },
-  "svclogicPropertiesDb01": "/opt/onap/sdnc/data/properties/svclogic.properties.sdnctldb01",
+  "svclogicPropertiesDb01": "{{.Values.config.configDir}}/svclogic.properties.sdnctldb01",
   "databases": [
-    "dbhost|sdnctldb01"
+    "sdnc-dbhost.{{.Release.Namespace}}|sdnc-sdnctldb01.{{.Release.Namespace}}"
   ],
   "dbFabricServer": "localhost",
   "dbFabricPort": "32275",
@@ -39,8 +39,8 @@
   "dbPassword": "gamma",
   "dbName": "sdnctl",
   "odlProtocol": "http",
-  "odlHost": "sdnhost.{{.Release.Namespace}}",
-  "odlConexusHost": "sdnhost.{{.Release.Namespace}}",
+  "odlHost": "{{.Release.Name}}-sdnc.{{.Release.Namespace}}",
+  "odlConexusHost": "{{.Release.Name}}-sdnc.{{.Release.Namespace}}",
   "odlPort": "8181",
   "odlConexusPort": "8181",
   "odlUser": "admin",
diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties
new file mode 100644
index 0000000000..e0e3295735
--- /dev/null
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties
@@ -0,0 +1,5 @@
+org.openecomp.sdnctl.sli.dbtype = jdbc
+org.openecomp.sdnctl.sli.jdbc.url = jdbc:mysql://sdnc-sdnctldb01:3306/sdnctl
+org.openecomp.sdnctl.sli.jdbc.database = sdnctl
+org.openecomp.sdnctl.sli.jdbc.user = sdnctl
+org.openecomp.sdnctl.sli.jdbc.password = gamma
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01 b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01
new file mode 100644
index 0000000000..e0e3295735
--- /dev/null
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01
@@ -0,0 +1,5 @@
+org.openecomp.sdnctl.sli.dbtype = jdbc
+org.openecomp.sdnctl.sli.jdbc.url = jdbc:mysql://sdnc-sdnctldb01:3306/sdnctl
+org.openecomp.sdnctl.sli.jdbc.database = sdnctl
+org.openecomp.sdnctl.sli.jdbc.user = sdnctl
+org.openecomp.sdnctl.sli.jdbc.password = gamma
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb02 b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb02
new file mode 100644
index 0000000000..e665a56d75
--- /dev/null
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb02
@@ -0,0 +1,5 @@
+org.openecomp.sdnctl.sli.dbtype = jdbc
+org.openecomp.sdnctl.sli.jdbc.url = jdbc:mysql://sdnc-sdnctldb02:3306/sdnctl
+org.openecomp.sdnctl.sli.jdbc.database = sdnctl
+org.openecomp.sdnctl.sli.jdbc.user = sdnctl
+org.openecomp.sdnctl.sli.jdbc.password = gamma
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml
index f2f2524dfd..fe08a96b39 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sdnc-portal-configmap
+  name: {{ include "common.fullname" . }}-portal
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
index 5e1293c37f..3ca8a6ba47 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
@@ -57,13 +57,13 @@ spec:
           - containerPort: {{ .Values.service.internalPort }}
           # disable liveness probe when breakpoints set in debugger
           # so K8s doesn't restart unresponsive container
-          {{- if eq .Values.liveness.enabled true }}
+          {{ if .Values.liveness.enabled }}
           livenessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
-          {{ end -}}
+          {{ end }}
           readinessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
@@ -82,7 +82,7 @@ spec:
             name: localtime
             readOnly: true
           - mountPath: {{ .Values.config.configDir }}
-            name: sdnc-conf
+            name: {{ include "common.fullname" . }}-portal
           resources:
 {{ toYaml .Values.resources | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -97,8 +97,8 @@ spec:
         - name: localtime
           hostPath:
             path: /etc/localtime
-        - name: sdnc-conf
+        - name: {{ include "common.fullname" . }}-portal
           configMap:
-            name: sdnc-portal-configmap
+            name: {{ include "common.fullname" . }}-portal
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index 09d45ddae3..3b3888973a 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -63,8 +63,8 @@ readiness:
 service:
   type: NodePort
   name: sdnc-portal
-  internalPort: 8443
-  externalPort: 8443
+  internalPort: 8843
+  externalPort: 8843
   nodePort: "01"
 
 ingress: