Merge "Fix OOF configuration for connectivity"

diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index e13193f..a990739 100755 (executable)
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -173,5 +173,8 @@ fi
         appcInstallEndTime=$(date +%s)
         echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
 
+echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
+java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
+
 exec ${ODL_HOME}/bin/karaf
 

diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml
index 6c85985..0ba73e3 100644 (file)
--- a/kubernetes/appc/templates/service.yaml
+++ b/kubernetes/appc/templates/service.yaml
@@ -31,6 +31,9 @@ spec:
     - port: {{ .Values.service.externalPort2 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
       name: "{{ .Values.service.portName }}-1830"
+    - port: {{ .Values.service.externalPort3 }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
+      name: "{{ .Values.service.portName }}-9090"
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
@@ -38,6 +41,9 @@ spec:
     - port: {{ .Values.service.externalPort2 }}
       targetPort: {{ .Values.service.internalPort2 }}
       name: {{ .Values.service.portName }}-1830
+    - port: {{ .Values.service.externalPort3 }}
+      targetPort: {{ .Values.service.internalPort3 }}
+      name: {{ .Values.service.portName }}-9090
     {{- end}}
   selector:
     app: {{ include "common.name" . }}

diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 79991f5..1bb7e23 100644 (file)
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -103,6 +103,10 @@ service:
   nodePort2: 31
   clusterPort: 2550
 
+  internalPort3: 9191
+  externalPort3: 9090
+  nodePort3: 11
+
 ## Persist data to a persitent volume
 persistence:
   enabled: true

diff --git a/kubernetes/policy/charts/brmsgw/values.yaml b/kubernetes/policy/charts/brmsgw/values.yaml
index efc3976..d8cbda4 100644 (file)
--- a/kubernetes/policy/charts/brmsgw/values.yaml
+++ b/kubernetes/policy/charts/brmsgw/values.yaml
@@ -25,7 +25,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.2.2
+image: onap/policy-pe:1.2.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/charts/drools/values.yaml b/kubernetes/policy/charts/drools/values.yaml
index ca62f2b..1bc09a7 100644 (file)
--- a/kubernetes/policy/charts/drools/values.yaml
+++ b/kubernetes/policy/charts/drools/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-drools:1.2.2
+image: onap/policy-drools:1.2.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 811830e..707b975 100644 (file)
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.2.2
+image: onap/policy-pe:1.2.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 42d5847..6aa8c7e 100644 (file)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -40,7 +40,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.2.2
+image: onap/policy-pe:1.2.3
 pullPolicy: Always
 
 subChartsOnly:

diff --git a/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties b/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
index 7388349..e353ace 100644 (file)
--- a/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
+++ b/kubernetes/portal/charts/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
@@ -19,7 +19,7 @@ security.user.name=widget_user
 security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)
 
 initialization.default.widgets=true
-initialization.widgetData.url=http://{{.Values.global.portalHostName}}:{{.Values.global.portalPort}}/ONAPPORTAL/commonWidgets
+initialization.widgetData.url=http://portal-app:8080/ONAPPORTAL/commonWidgets
 
 ## Account Basic Authentication Properties
 account.user.name=portal

diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json
index 8276d25..e220346 100755 (executable)
--- a/kubernetes/so/resources/config/mso/mso-docker.json
+++ b/kubernetes/so/resources/config/mso/mso-docker.json
@@ -193,8 +193,8 @@
       "callbackRetrySleepTime": "1000",
       "appcClientTopicRead": "APPC-LCM-READ",
       "appcClientTopicWrite": "APPC-LCM-WRITE",
-      "appcClientTopicSdncRead": "SDNC-LCM-READ",
-      "appcClientTopicSdncWrite": "SDNC-LCM-WRITE",
+      "appcClientTopicSdncRead": "SDNC-LCM-WRITE",
+      "appcClientTopicSdncWrite": "SDNC-LCM-READ",
       "appcClientTopicReadTimeout": "360000",
       "appcClientResponseTime": "360000",
       "appcClientPoolMembers": "{{.Values.config.messagerouter.serviceName}}:{{.Values.config.messagerouter.port}}",

diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 3cb1a43..e7fb378 100644 (file)
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -27,7 +27,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vid:1.2.1
+image: onap/vid:2.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required