summaryrefslogtreecommitdiffstats
path: root/docs/guides/onap-operator
diff options
context:
space:
mode:
Diffstat (limited to 'docs/guides/onap-operator')
-rw-r--r--docs/guides/onap-operator/cloud_site/openstack/index.rst2
-rw-r--r--docs/guides/onap-operator/onap_backup_restore.rst11
-rw-r--r--docs/guides/onap-operator/platformoperations.rst4
-rw-r--r--docs/guides/onap-operator/settingup/index.rst9
4 files changed, 19 insertions, 7 deletions
diff --git a/docs/guides/onap-operator/cloud_site/openstack/index.rst b/docs/guides/onap-operator/cloud_site/openstack/index.rst
index 7d77c188f..0bceedac9 100644
--- a/docs/guides/onap-operator/cloud_site/openstack/index.rst
+++ b/docs/guides/onap-operator/cloud_site/openstack/index.rst
@@ -161,7 +161,7 @@ to delete the pod:
::
- kubectl -n onap delete onap-so-so-bpmn-infra-79fdf6f9d5-t8qr4
+ kubectl -n onap delete po onap-so-so-bpmn-infra-79fdf6f9d5-t8qr4
Then, wait for the pod to restart. To check:
diff --git a/docs/guides/onap-operator/onap_backup_restore.rst b/docs/guides/onap-operator/onap_backup_restore.rst
index bffd16c12..a564d6a1e 100644
--- a/docs/guides/onap-operator/onap_backup_restore.rst
+++ b/docs/guides/onap-operator/onap_backup_restore.rst
@@ -1,6 +1,6 @@
.. This work is licensed under a Creative Commons Attribution 4.0
.. International License. http://creativecommons.org/licenses/by/4.0
-.. Copyright © 2017-2020 Aarna Networks, Inc.
+.. Copyright 2017-2020 Aarna Networks, Inc.
.. Links
.. Github web page to download the latest version of velero open source tool
@@ -11,6 +11,13 @@
Backup and Restore Solution
###########################
+.. warning::
+ This description is not covering the Backup & Restore procedure of the full
+ ONAP platform, but gives examples for the usage of Velero.
+ The ONAP community will focus on Disaster Recovery including B&R
+ in the coming releases.
+
+
Problem Statement and Requirement (User Story)
==============================================
@@ -855,7 +862,7 @@ Disaster recovery
Using Schedules and Restore-Only Mode
-If you periodically back up your cluster’s resources, you are able to return to a previous state in case of some unexpected mishap, such as a service outage.
+If you periodically back up your cluster resources, you are able to return to a previous state in case of some unexpected mishap, such as a service outage.
Cluster migration
~~~~~~~~~~~~~~~~~
diff --git a/docs/guides/onap-operator/platformoperations.rst b/docs/guides/onap-operator/platformoperations.rst
index 3d4f8a614..cb989c73d 100644
--- a/docs/guides/onap-operator/platformoperations.rst
+++ b/docs/guides/onap-operator/platformoperations.rst
@@ -83,10 +83,6 @@ To backup and restore ONAP component specific databases you can follow the below
onap_backup_restore.rst
-.. note::
- Refer to the wiki page for further details:
- `Legacy Backup and Restore Solution <https://wiki.onap.org/display/DW/Backup+and+Restore+Solution%3A+ONAP-OOM>`_
-
ONAP Multisite Deployment
-------------------------
diff --git a/docs/guides/onap-operator/settingup/index.rst b/docs/guides/onap-operator/settingup/index.rst
index 7fa4df5bc..9f27db748 100644
--- a/docs/guides/onap-operator/settingup/index.rst
+++ b/docs/guides/onap-operator/settingup/index.rst
@@ -6,6 +6,7 @@
.. Modifications Copyright 2018 Amdocs
.. Modifications Copyright 2018 Huawei
.. Modifications Copyright 2019 Orange
+.. Modifications Copyright 2021 Nokia
Setting Up ONAP
===============
@@ -47,6 +48,14 @@ Creation of Kubernetes cluster is described here:
:ref:`ONAP on HA Kubernetes Cluster<onap-oom:onap-on-kubernetes-with-rancher>`
+Some ONAP functionalities require optional PaaS components described here:
+
+.. toctree::
+ :maxdepth: 2
+ :titlesonly:
+
+:ref:`ONAP PaaS set-up (optional)<onap-oom:oom_setup_paas>`
+
ONAP installation is described here:
.. toctree::