summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-03-19 19:24:56 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-19 19:24:56 +0000
commitec97119b7caa591f7c199c8e60f9a2fb45548a92 (patch)
tree43b2e876e9c097db4cf7471d2d9033f11ab06e73
parentf2158a2f746b9170551bb214bedcd2e897fd8a76 (diff)
parentaf8dccb6f5c1fb92cdd701488a733542cfcf128d (diff)
Merge "New VID certificate valid until: Mar 17, 2021"
-rw-r--r--docs/oom_hardcoded_certificates.rst18
-rw-r--r--docs/oom_project_description.rst1
-rw-r--r--kubernetes/vid/resources/certs/org.onap.vid.jksbin3612 -> 3597 bytes
-rw-r--r--kubernetes/vid/values.yaml2
4 files changed, 20 insertions, 1 deletions
diff --git a/docs/oom_hardcoded_certificates.rst b/docs/oom_hardcoded_certificates.rst
new file mode 100644
index 0000000000..84ca2d0eed
--- /dev/null
+++ b/docs/oom_hardcoded_certificates.rst
@@ -0,0 +1,18 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright 2018 Amdocs, Bell Canada
+
+.. Links
+.. _hardcoded-certiticates-label:
+
+ONAP Hardcoded certificates
+###########################
+
+ONAP current installation have hardcoded certificates.
+Here's the list of these certificates:
+
+ +----------------------------------------------------------------------------------+
+ | Project | ONAP Certificate | Own Certificate | Path |
+ +============+==================+==================+===============================+
+ | VID | No | Yes | kubernetes/vid/resources/cert |
+ +------------+------------------+------------------+-------------------------------+
diff --git a/docs/oom_project_description.rst b/docs/oom_project_description.rst
index 6486f4bab7..7903b709d8 100644
--- a/docs/oom_project_description.rst
+++ b/docs/oom_project_description.rst
@@ -38,6 +38,7 @@ The OOM documentation is broken into four different areas each targeted at a dif
- :ref:`user-guide-label` - a guide for operators of an ONAP instance
- :ref:`developer-guide-label` - a guide for developers of OOM and ONAP
- :ref:`cloud-setup-guide-label` - a guide for those setting up cloud environments that ONAP will use
+- :ref:`hardcoded-certiticates-label` - the list of all hardcoded certificates sets in ONAP installation
The :ref:`release-notes-label` for OOM describe the incremental features per release.
diff --git a/kubernetes/vid/resources/certs/org.onap.vid.jks b/kubernetes/vid/resources/certs/org.onap.vid.jks
index 2b9338dc74..a05f12d857 100644
--- a/kubernetes/vid/resources/certs/org.onap.vid.jks
+++ b/kubernetes/vid/resources/certs/org.onap.vid.jks
Binary files differ
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index fb8f1a04f8..f22ea19e56 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -51,7 +51,7 @@ config:
userName: vidadmin
# userCredentialsExternalSecret: some secret
# userPassword: password
- vidkeystorepassword: '\^7w\!f+aR\{EJcTRsDuA7x\,+c\!'
+ vidkeystorepassword: 'F:.\,csU\&ew8\;tdVitnfo\}O\!g'
asdcclientrestauth: "Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
asdcclientrestport: "8443"
vidaaiport: "8443"