summaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/charts/policy-pap
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-11-14 13:35:13 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-11-21 14:07:35 +0100
commit4898dc0d5b06479f67277886549dbd64416821a4 (patch)
tree6144b5b27b3b3d0d5fbfd3fa16efce4d122ec36f /kubernetes/policy/charts/policy-pap
parent0b844c9a74e29e2046c96f4635c429eb4dc8d677 (diff)
[Policy] Use common mariadb galera chart
Instead of using "own" galera chart, reuse chart placed in common part of OOM installation. Will ease move to common galera cluster (which is not done by this commit). Change-Id: I2d7c1e5cdc9289cfb55e288b1697373239ef96e3 Issue-ID: POLICY-1467 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'kubernetes/policy/charts/policy-pap')
-rw-r--r--kubernetes/policy/charts/policy-pap/resources/config/config.json6
-rw-r--r--kubernetes/policy/charts/policy-pap/templates/deployment.yaml2
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/policy/charts/policy-pap/resources/config/config.json b/kubernetes/policy/charts/policy-pap/resources/config/config.json
index a665c07858..48065aeb4b 100644
--- a/kubernetes/policy/charts/policy-pap/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-pap/resources/config/config.json
@@ -40,9 +40,9 @@
"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=",
+ "databaseUrl": "jdbc:mariadb://{{ .Values.global.mariadb.service.name }}:{{ .Values.global.mariadb.service.internalPort }}/{{ .Values.global.mariadb.config.mysqlDatabase }}",
+ "databaseUser": "{{ .Values.global.mariadb.config.userName }}",
+ "databasePassword": "{{ .Values.global.mariadb.config.userPassword | b64enc }}",
"persistenceUnit": "PolicyMariaDb"
},
"topicParameterGroup": {
diff --git a/kubernetes/policy/charts/policy-pap/templates/deployment.yaml b/kubernetes/policy/charts/policy-pap/templates/deployment.yaml
index 3332f60944..a3adfeebc2 100644
--- a/kubernetes/policy/charts/policy-pap/templates/deployment.yaml
+++ b/kubernetes/policy/charts/policy-pap/templates/deployment.yaml
@@ -21,7 +21,7 @@ spec:
- /root/ready.py
args:
- --container-name
- - {{ .Values.global.mariadb.nameOverride }}
+ - {{ .Values.global.mariadb.service.name }}
env:
- name: NAMESPACE
valueFrom: