summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/resources
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-09-10 07:41:02 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-10 07:41:02 +0000
commit8c62083d8ac58e74f16409adf775cb1c49063745 (patch)
treea1bb88d71983737ab19eabf88931a313d3811882 /kubernetes/sdc/resources
parent86a28cdb200f482bc9a2e1f281ec1c51938f6c2c (diff)
parent742a7b29bfb6ffb18ef65b0a45ad08de59e52a6e (diff)
Merge "[SDC] use of certInitializer template"
Diffstat (limited to 'kubernetes/sdc/resources')
-rw-r--r--kubernetes/sdc/resources/cert/org.onap.sdc.p12bin4443 -> 0 bytes
-rw-r--r--kubernetes/sdc/resources/cert/org.onap.sdc.trust.jksbin1413 -> 0 bytes
-rwxr-xr-xkubernetes/sdc/resources/config/environments/AUTO.json7
3 files changed, 4 insertions, 3 deletions
diff --git a/kubernetes/sdc/resources/cert/org.onap.sdc.p12 b/kubernetes/sdc/resources/cert/org.onap.sdc.p12
deleted file mode 100644
index 446856071b..0000000000
--- a/kubernetes/sdc/resources/cert/org.onap.sdc.p12
+++ /dev/null
Binary files differ
diff --git a/kubernetes/sdc/resources/cert/org.onap.sdc.trust.jks b/kubernetes/sdc/resources/cert/org.onap.sdc.trust.jks
deleted file mode 100644
index e6686cc08c..0000000000
--- a/kubernetes/sdc/resources/cert/org.onap.sdc.trust.jks
+++ /dev/null
Binary files differ
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 2bd165b723..b38b1f65aa 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -1,6 +1,6 @@
{
- "name": "{{ .Values.global.env.name }}",
- "description": "OpenSource-{{ .Values.global.env.name }}",
+ "name": "{{ .Values.env.name }}",
+ "description": "OpenSource-{{ .Values.env.name }}",
"cookbook_versions": {
"Deploy-SDandC": "= 1.0.0"
},
@@ -107,7 +107,8 @@
},
"jetty": {
"keystore_pwd": "${KEYSTORE_PASS}",
- "truststore_pwd": "${TRUSTSTORE_PASS}"
+ "truststore_pwd": "${TRUSTSTORE_PASS}",
+ "keymanager_pwd": "${KEYMANAGER_PASS}"
}
}
}