From 8fdac3a5ff89610c88ed8ea4462521d696530a5c Mon Sep 17 00:00:00 2001
From: Chenfei Gao <cgao@research.att.com>
Date: Fri, 12 Apr 2019 14:39:40 -0400
Subject: Fix policy/api charts

Add "policyadmin" db into policy-api config.json

Issue-ID: POLICY-1640
Change-Id: I9c091b35eaae0a734d4371bcf619ebdfa9dac9d3
Signed-off-by: Chenfei Gao <cgao@research.att.com>
---
 .../policy/charts/policy-api/resources/config/config.json | 11 ++++++++++-
 .../policy/charts/policy-api/templates/deployment.yaml    | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'kubernetes')

diff --git a/kubernetes/policy/charts/policy-api/resources/config/config.json b/kubernetes/policy/charts/policy-api/resources/config/config.json
index 9fef1998d1..16e0a51682 100644
--- a/kubernetes/policy/charts/policy-api/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-api/resources/config/config.json
@@ -22,5 +22,14 @@
         "port":6969,
         "userName":"healthcheck",
         "password":"zb!XztG34"
+    },
+    "databaseProviderParameters": {
+        "name": "PolicyProviderParameterGroup",
+        "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl",
+        "databaseDriver": "org.mariadb.jdbc.Driver",
+        "databaseUrl": "jdbc:mariadb://{{.Values.global.mariadb.nameOverride}}:3306/policyadmin",
+        "databaseUser": "policy_user",
+        "databasePassword": "cG9saWN5X3VzZXI=",
+        "persistenceUnit": "PolicyMariaDb"
     }
-}
+}
\ No newline at end of file
diff --git a/kubernetes/policy/charts/policy-api/templates/deployment.yaml b/kubernetes/policy/charts/policy-api/templates/deployment.yaml
index 2d16b5e857..b79c6bf9c7 100644
--- a/kubernetes/policy/charts/policy-api/templates/deployment.yaml
+++ b/kubernetes/policy/charts/policy-api/templates/deployment.yaml
@@ -16,6 +16,21 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
+      initContainers:
+        - command:
+          - /root/ready.py
+          args:
+          - --container-name
+          - {{ .Values.global.mariadb.nameOverride }}
+          env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
+          image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          name: {{ include "common.name" . }}-readiness
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
-- 
cgit 1.2.3-korg