8 files changed, 33 insertions, 10 deletions
diff --git a/kubernetes/common/network-name-gen/resources/config/aai_keystore b/kubernetes/common/network-name-gen/resources/config/aai_keystore
new file mode 100644
index 0000000000..83cae95273
--- /dev/null
+++ b/kubernetes/common/network-name-gen/resources/config/aai_keystore
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 743c8be02e..dac4e0d4ce 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -77,6 +77,13 @@ spec:
           value: "{{ .Values.config.aaiCertPath }}"
         - name: AAI_URI
           value: "{{ .Values.config.aaiUri }}"
+        - name: AAI_AUTH
+          value: "{{ .Values.config.aaiAuth }}"
+        volumeMounts:
+        - name: certs
+          mountPath: /opt/etc/config/aai_keystore
+          subPath: aai_keystore
+          readOnly: true
         resources:
 {{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -87,6 +94,9 @@ spec:
         affinity:
 {{ toYaml .Values.affinity | indent 10 }}
         {{- end }}
-
+      volumes:
+      - name: certs
+        secret:
+            secretName: {{ .Release.Name}}-aai-keystore
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/common/network-name-gen/templates/secrets.yaml b/kubernetes/common/network-name-gen/templates/secrets.yaml
index b50ad4eb26..4b6d97acad 100644
--- a/kubernetes/common/network-name-gen/templates/secrets.yaml
+++ b/kubernetes/common/network-name-gen/templates/secrets.yaml
@@ -25,3 +25,11 @@ metadata:
 type: Opaque
 data:
   db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}
+---
+apiVersion: v1
+data:
+{{ tpl (.Files.Glob "resources/config/aai_keystore").AsConfig . | indent 2 }}
+metadata:
+  name: {{ .Release.Name}}-aai-keystore
+  namespace: {{ include "common.namespace" . }}
+kind: Secret
diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index b40ac91cbc..67ba1ce274 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -61,14 +61,15 @@ pullPolicy: IfNotPresent
 config:
   dbUrl: jdbc:mysql://nengdb:3306/nengdb
   springProfile: live
-  polClientAuth: TBD
-  polBasicAuth: TBD
-  polUrl: TBD
+  polClientAuth: cHl0aG9uOnRlc3Q=
+  polBasicAuth: dGVzdHBkcDphbHBoYTEyMw==
+  polUrl: https://pdp:8081/pdp/api/getConfig
   polEnv: TEST
   polReqId: xx
-  aaiCertPass: TBD
-  aaiCertPath: TBD
-  aaiUri: TBD
+  aaiCertPass: changeit
+  aaiCertPath: /opt/etc/config/aai_keystore
+  aaiAuth: QUFJOkFBSQ==
+  aaiUri: https://aai:8443/aai/v14/
 
 # default number of instances
 replicaCount: 1
diff --git a/kubernetes/portal/charts/portal-app/templates/service.yaml b/kubernetes/portal/charts/portal-app/templates/service.yaml
index 4ccf2b02b8..9d7073243d 100644
--- a/kubernetes/portal/charts/portal-app/templates/service.yaml
+++ b/kubernetes/portal/charts/portal-app/templates/service.yaml
@@ -49,6 +49,10 @@ spec:
       targetPort: {{ .Values.service.internalPort3 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
       name: {{ .Values.service.portName }}3
+    - port: {{ .Values.service.externalPort4 }}
+      targetPort: {{ .Values.service.internalPort4 }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort4 }}
+      name: {{ .Values.service.portName }}4
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index 0aba001fa4..d34a08bb45 100644
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -65,7 +65,7 @@ service:
   nodePort3: 14
   externalPort4: 8443
   internalPort4: 8443
-  nodePort4: 16
+  nodePort4: 25
 
 mariadb:
   service:
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 04a349f176..fb920574c5 100755
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -60,7 +60,7 @@ openStackProjectName: "onap"
 # Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
 openStackDomainId: "default"
 # Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
-openStackKeystoneAPIVersion: "v2.0"
+openStackKeystoneAPIVersion: ""
 # Openstack glance image name for Ubuntu 14.  Maps to GLOBAL_INJECTED_UBUNTU_1404_IMAGE
 ubuntu14Image: "Ubuntu_14_trusty"
 # Openstack glance image name for Ubuntu 16.  Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 9a23c1d7fc..4c635facd2 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -79,7 +79,7 @@ spec:
             - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
               value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/context
             - name: VID_MSO_SERVER_URL
-              value: https://so.{{ include "common.namespace" . }}:{{ .Values.config.msoport }}
+              value: http://so.{{ include "common.namespace" . }}:{{ .Values.config.msoport }}/onap/so/infra
             - name: VID_MSO_PASS
               value: "{{ .Values.config.vidmsopass }}"
             - name: MSO_DME2_SERVER_URL