diff options
| -rw-r--r-- | docs/sections/apis/DFC.rst | 2 | ||||
| -rw-r--r-- | docs/sections/installation_oom.rst | 14 | ||||
| -rw-r--r-- | docs/sections/services/mapper/index.rst | 2 | ||||
| -rw-r--r-- | docs/sections/services/prh/authorization.rst | 2 | ||||
| -rw-r--r-- | docs/sections/services/ves-http/index.rst | 15 |
5 files changed, 19 insertions, 16 deletions
diff --git a/docs/sections/apis/DFC.rst b/docs/sections/apis/DFC.rst index c8540187..df68064c 100644 --- a/docs/sections/apis/DFC.rst +++ b/docs/sections/apis/DFC.rst @@ -167,7 +167,7 @@ We have two keystore files, one for TrustManager, one for KeyManager. -------------------- update /etc/vsftpd/vsftpd.conf: - .. code-block:: javascript + .. code-block:: bash rsa_cert_file=/etc/ssl/private/ftp.crt rsa_private_key_file=/etc/ssl/private/ftp.key diff --git a/docs/sections/installation_oom.rst b/docs/sections/installation_oom.rst index 9691dce6..24a56119 100644 --- a/docs/sections/installation_oom.rst +++ b/docs/sections/installation_oom.rst @@ -10,9 +10,9 @@ This document describes the details of the Helm Chart based deployment process f ONAP Deployment Overview ------------------------ -ONAP R3 is extention to R2 Kubernetes deployment. Kuberenetes is a container orchestration technology that organizes containers into composites of various patterns for easy deployment, management, and scaling. R2 ONAP utilizes Kubernetes as the foundation for fulfilling its platform maturity promises. +ONAP R3 is an extension of R2 Kubernetes deployment. Kubernetes is a container orchestration technology that organizes containers into composites of various patterns for easy deployment, management, and scaling. R2 ONAP utilized Kubernetes as the foundation for fulfilling its platform maturity promises and R3 contiunues to do so. -Further, R2 ONAP manages Kubernetes specifications using Helm Charts, under which all Kuberentes yaml-formatted resource specifications and additional files are organized into a hierarchy of charts, sub-charts, and resources. These yaml files are further augmented with Helm's templating, which makes dependencies and cross-references of parameters and parameter derivatives among resources manageable for a large and complex Kuberentes system such as ONAP. +ONAP manages Kubernetes specifications using Helm Charts, under which all Kubernetes yaml-formatted resource specifications and additional files are organized into a hierarchy of charts, sub-charts, and resources. These yaml files are further augmented with Helm's templating, which makes dependencies and cross-references of parameters and parameter derivatives among resources manageable for a large and complex Kubernetes system such as ONAP. At deployment time, with a single **helm install** command, Helm resolves all the templates and compiles the chart hierarchy into Kubernetes resource definitions, and invokes Kubernetes deployment operation for all the resources. @@ -20,8 +20,8 @@ All ONAP Helm Charts are organized under the **kubernetes** directory of the **O The PNDA data platform is an optional DCAE component that is placed under the **pnda** directory. Details for how to configure values to enable PNDA installation during Helm install -are described in `Installing PNDA During Helm Chart Based DCAE Deployment -<installation_pnda.html>`_. +are described in :doc:`Installing PNDA During Helm Chart Based DCAE Deployment +<installation_pnda>`. DCAE Chart Organization ----------------------- @@ -128,9 +128,9 @@ DCAE Service Endpoints ---------------------- Below is a table of default hostnames and ports for DCAE component service endpoints in Kuubernetes deployment: - ================== ============================ ====================================================== + ================== ================================= ====================================================== Component Cluster Internal (host:port) Cluster external (svc_name:port) - ================== ============================ ====================================================== + ================== ================================= ====================================================== VES dcae-ves-collector:8080 xdcae-ves-collector.onap:30235 HV-VES dcae-hv-ves-collector:6061 xdcae-hv-ves-collector.onap:30222 TCA dcae-tca-analytics:11011 xdcae-tca-analytics.onap:32010 @@ -143,7 +143,7 @@ Below is a table of default hostnames and ports for DCAE component service endpo Config binding config-binding-service:10000 NA DCAE Healthcheck dcae-healthcheck:80 NA Cloudify Manager dcae-cloudify-manager:80 NA - ================== ============================ ====================================================== + ================== ================================= ====================================================== In addition, a number of ONAP service endpoints that are used by DCAE components are listed as follows for reference by DCAE developers and testers: diff --git a/docs/sections/services/mapper/index.rst b/docs/sections/services/mapper/index.rst index 8d5ebed9..b142ded0 100644 --- a/docs/sections/services/mapper/index.rst +++ b/docs/sections/services/mapper/index.rst @@ -21,7 +21,7 @@ There are 2 micro services in the mapper functionality. .. toctree:: - :maxdepth: 1 + :maxdepth: 1 ./flow.rst ./delivery.rst diff --git a/docs/sections/services/prh/authorization.rst b/docs/sections/services/prh/authorization.rst index fe5ed40b..6bf712e1 100644 --- a/docs/sections/services/prh/authorization.rst +++ b/docs/sections/services/prh/authorization.rst @@ -24,6 +24,7 @@ Certificate-based | To achieve this secure flag needs to be turned on in PRH :ref:`configuration<prh_configuration>` : .. code-block:: json + security.enableAaiCertAuth=true DMaaP BC authentication @@ -41,6 +42,7 @@ Certificate-based | To achieve this secure flag needs to be turned on in PRH :ref:`configuration<prh_configuration>` : .. code-block:: json + --security.enableDmaapCertAuth=true PRH identity and certificate data diff --git a/docs/sections/services/ves-http/index.rst b/docs/sections/services/ves-http/index.rst index fcdbdc2b..48b91d8c 100644 --- a/docs/sections/services/ves-http/index.rst +++ b/docs/sections/services/ves-http/index.rst @@ -17,14 +17,15 @@ VES Collector (HTTP) overview and functions .. toctree:: - :maxdepth: 1 - ./architecture.rst - ./configuration.rst - ./delivery.rst - ./installation.rst + :maxdepth: 1 + + ./architecture.rst + ./configuration.rst + ./delivery.rst + ./installation.rst + - API reference ^^^^^^^^^^^^^ -Refer to :doc:`VES APIs<../../apis/ves.rst>` for detailed api information.
\ No newline at end of file +Refer to :doc:`VES APIs <../../apis/ves>` for detailed api information. |