prep

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

4 files changed, 28 insertions, 5 deletions

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 a9eac31405..84829e7f8c 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
@@ -43,6 +43,18 @@ bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081
 msb-ip: msb-iag.{{ include "common.namespace" . }}
 msb-port: 80
 mso:
+  use:
+    qualified:
+      host: false
+  multivim:
+    timeout: PT30M
+    adapters:
+      vnf:
+        rest:
+          endpoint: http://so-multivim-adapter.{{ include "common.namespace" . }}:8088/multivim/rest/v1/vnf
+  has:
+    timeout: 30
+    endpoint: http://localhost:8080/api/oof/v1/placement
   msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   correlation:
     timeout: 60
@@ -152,6 +164,8 @@ mso:
         generic-vnf:
           version: '14'
         v14:
+          cloud-region:
+            uri: /aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner
           customer:
             uri: /aai/v14/business/customers/customer
           generic-query:
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
index ad3a19f37e..d11fe2b6a4 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
         name: {{ include "common.name" . }}-readiness
       containers:
       - name: {{ include "common.name" . }}
-        image: {{ include "common.repository" . }}/{{ .Values.image }}
+        image: "{{ .Values.repository }}/{{ .Values.image }}"
         resources:
 {{ include "common.resources" . | indent 12 }}
         env:
@@ -85,6 +85,8 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name}}-so-db-secrets
               key: mariadb.admin.password
+        - name: JVM_ARGS
+          value: -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address={{ .Values.service.internalPort2 }}
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
index 741614886c..bf423c6fab 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
@@ -26,8 +26,11 @@ spec:
   ports:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort }}
       name: {{ .Values.service.portName }}
+    - port: {{ .Values.service.internalPort2 }}
+      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort2 }}
+      name: {{ .Values.service.portName2 }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/so/charts/so-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml
index 047179eb1b..1cb73e662f 100755
--- a/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@ -26,8 +26,8 @@ global:
 #################################################################
 # Application configuration defaults.
 #################################################################
-repository: nexus3.onap.org:10001
-image: onap/so/bpmn-infra:1.3.6
+repository: oomk8s
+image: sbn-oaz:latest
 pullPolicy: Always
 
 replicaCount: 1
@@ -36,10 +36,14 @@ containerPort: 8081
 logPath: ./logs/bpmn/
 app: so-bpmn-infra
 service:
-    type: ClusterIP
+    type: NodePort
     internalPort: 8081
     externalPort: 8081
+    nodePort: "04"
     portName: so-bpmn-port
+    internalPort2: 5005
+    nodePort2: "05"
+    portName2: so-bpmn-debug
 updateStrategy:
     type: RollingUpdate
     maxUnavailable: 1