From: Ramesh Parthasarathy <ramesh.parthasarathy@att.com>
Date: Mon, 15 Oct 2018 22:11:06 +0000 (+0000)
Subject: so-minitoring po startup issue
X-Git-Tag: 3.0.0-ONAP~169
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f74978f7a52637ce358bf71e8d3be55f95031153;p=oom.git

so-minitoring po startup issue

so-monitoring pod doesn't start completely.
This issue has been addressed here

Change-Id: Iab0d8fd3f1a7b9b000d2eac3968fefc07b5b2230
Issue-ID: SO-1138
Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com>
---

diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
index 19c6028202..57d4fdf10b 100755
--- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -257,7 +257,7 @@ appc:
     service: ueb
     poolMembers: message-router.{{ include "common.namespace" . }}:3904,message-router.{{ include "common.namespace" . }}:3904
 server:
-  port: 8081
+  port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
 spring:
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
index bdf82b6fbd..320af6127e 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 server:
-    port: 8082
+    port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
 ssl-enable: false
diff --git a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
index c7e958c5a9..7434b14da2 100644
--- a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
@@ -1,5 +1,5 @@
 server:
-  port: 8088
+  port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
 ssl-enable: false
diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
index f7e9e47947..98b0976314 100755
--- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 server:
-  port: 8087
+  port: {{ index .Values.containerPort }}
 spring:
   datasource:
     url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
diff --git a/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml
index 49ccdeb097..2755f94f41 100755
--- a/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 # will be used as entry in DB to say SITE OFF/ON for healthcheck
 server:
-    port: 8083
+    port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
 ssl-enable: false
diff --git a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
index 8b33067a8a..f45abbb3d3 100755
--- a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
@@ -14,7 +14,7 @@
 aai:
   auth: 2630606608347B7124C244AB0FE34F6F
 server:
-  port: 8085
+  port: {{ index .Values.containerPort }}
 spring:
   datasource:
     url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
diff --git a/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml
index 615988066a..2ebdfb3a7f 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 server:
-    port: 8086
+    port: {{ index .Values.containerPort }}
 mso:
     async:
         core-pool-size: 50
diff --git a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
index b8108ab8f8..da26017c4d 100755
--- a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
@@ -25,7 +25,7 @@ spring:
       validation-query: select 1
       test-on-borrow: true
 server:
-    port: 8084
+    port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
 mso:
diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index 1806b20dbb..6adc2120fb 100755
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -1,5 +1,5 @@
 server:
-    port: 8080
+    port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
 ssl-enable: false