summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Bennett <rb2745@att.com>2018-11-24 13:15:18 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-24 13:15:18 +0000
commit2cdc72e2a9423e22c10f603da93180294ee6638d (patch)
tree5580d6210a817c0a6e54a1627ec8447fab736508
parent38093607a9f845bf328e6d0831c34130ecd8ae09 (diff)
parent43f5aec27abb9828d2aabe17a7d14f09226c245a (diff)
Merge "Correct release note"
-rw-r--r--docs/guides/onap-developer/settingup/index.rst2
-rw-r--r--docs/release/index.rst16
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/guides/onap-developer/settingup/index.rst b/docs/guides/onap-developer/settingup/index.rst
index d9139c7e6..58883d730 100644
--- a/docs/guides/onap-developer/settingup/index.rst
+++ b/docs/guides/onap-developer/settingup/index.rst
@@ -9,6 +9,8 @@
Setting Up ONAP
===============
+.. _installing-onap:
+
ONAP is deployed using the ONAP Operations Manager (OOM).
The recommended ONAP deployment is based on Kubernetes, Docker containers
diff --git a/docs/release/index.rst b/docs/release/index.rst
index 323bd3e64..81610e506 100644
--- a/docs/release/index.rst
+++ b/docs/release/index.rst
@@ -97,7 +97,7 @@ Detect -> Publish -> Respond:
**Microservices Support**
- - ONAP Operation Manager (OOM) use kubernetes and Helm to manage ONAP
+ - ONAP Operation Manager (OOM) use Kubernetes and Helm to manage ONAP
components.
- Microservices Bus (MSB) provides service registration/discovery,
external API gateway, internal API gateway, client software development kit
@@ -116,13 +116,8 @@ are compatible with a major release are made available.
Installation
============
-There are 3 approaches to install ONAP:
-
-* :ref:`Installation using Kubernetes (aka OOM) <installing-onap-k8s>`.
- Recommended method.
-* :ref:`Installation using Heat template <installing-onap-heat>`.
-* :ref:`Advanced installation to install individual components
- <installing-onap-individual>`.
+ONAP is installed using
+:ref:`ONAP Operations Manager (OOM) over Kubernetes<installing-onap>`
Documentation
=============
@@ -145,7 +140,10 @@ ONAP Casablanca Release provides multiple documents including the following:
Security Notes
==============
-ONAP has adopted the `CII Best Practice Badge Program <https://bestpractices.coreinfrastructure.org/en>`_. The goal of the Casablanca release is for all ONAP projects to be close to achieving a CII Passing badge.
+ONAP has adopted the
+`CII Best Practice Badge Program <https://bestpractices.coreinfrastructure.org/en>`_.
+The goal of the Casablanca release is for all ONAP projects to be close to
+achieving a CII Passing badge.
- `Badging Requirements <https://github.com/coreinfrastructure/best-practices-badge#core-infrastructure-initiative-best-practices-badge>`_
- `Badging Status for all ONAP projects <https://bestpractices.coreinfrastructure.org/en/projects?q=onap>`_