From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Fri, 5 Oct 2018 12:32:32 +0000 (+0000)
Subject: Merge "Keystone API Support"
X-Git-Tag: 3.0.0-ONAP~220
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=01f587ea56301f07ebc8fcdd24e52ab8489767b6;hp=96b46eb0d09680dff50bacdbbcc1846343d562bd;p=oom.git

Merge "Keystone API Support"
---

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
Binary files /dev/null and b/kubernetes/common/network-name-gen/resources/config/aai_keystore differ
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/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml
index d4ee73e303..50da2cc49c 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml
@@ -81,7 +81,7 @@ application_config:
         target_entity : "deployment_handler"
         # url of the deployment-handler service for policy-handler to direct the policy-updates to
         #   - expecting dns to resolve the hostname deployment-handler to ip address
-        url : "http://deployment-handler:8188"
+        url : "https://deployment-handler:8443"
         # limit the size of a single data segment for policy-update messages
         #       from policy-handler to deployment-handler in megabytes
         max_msg_length_mb : 5