diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/installationprocedure/baremetal.rst | 23 | ||||
| -rw-r--r-- | docs/installationprocedure/virtualinstall.rst | 4 | ||||
| -rw-r--r-- | docs/releasenotes/release-notes.rst | 1 |
3 files changed, 14 insertions, 14 deletions
diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst index 2de6e8a8..878a49d7 100644 --- a/docs/installationprocedure/baremetal.rst +++ b/docs/installationprocedure/baremetal.rst @@ -119,7 +119,6 @@ Install Bare Metal Jumphost - opnfv-apex - OpenDaylight L2 / L3 and ONOS support * - opnfv-apex-onos - ONOS support * - - opnfv-apex-opendaylight-sfc - OpenDaylight SFC support * - opnfv-apex-undercloud - (reqed) Undercloud Image - opnfv-apex-common - (reqed) Supporting config files and scripts - python34-markupsafe - (reqed) Dependency of opnfv-apex-common ** @@ -127,9 +126,9 @@ Install Bare Metal Jumphost - python3-ipmi - (reqed) Dependency of opnfv-apex-common ** \* One or more of these RPMs is required - Only one of opnfv-apex, opnfv-apex-onos and opnfv-apex-opendaylight-sfc is - required. It is safe to leave the unneeded SDN controller's RPMs - uninstalled if you do not intend to use them. + Only one of opnfv-apex or opnfv-apex-onos is required. It is safe to leave + the unneeded SDN controller's RPMs uninstalled if you do not intend to use + them. ** These RPMs are not yet distributed by CentOS or EPEL. Apex has built these for distribution with Apex while CentOS and EPEL do @@ -185,18 +184,20 @@ IPMI configuration information gathered in section - ``ipmi_user``: IPMI username - ``ipmi_password``: IPMI password - ``pm_type``: Power Management driver to use for the node + values: pxe_ipmitool (tested) or pxe_wol (untested) or pxe_amt (untested) - ``cpus``: (Introspected*) CPU cores available - ``memory``: (Introspected*) Memory available in Mib - ``disk``: (Introspected*) Disk space available in Gb - ``arch``: (Introspected*) System architecture - - ``capabilities``: (Opt**) Node role (profile:control or profile:compute) + - ``capabilities``: (Opt**) Node's role in deployment + values: profile:control or profile:compute -\* *Introspection looks up the overcloud node's resources and overrides these + \* Introspection looks up the overcloud node's resources and overrides these value. You can leave default values and Apex will get the correct values when - it runs introspection on the nodes.* + it runs introspection on the nodes. -** *If capabilities profile is not specified then Apex will select node's roles - in the OPNFV cluster in a non-deterministic fashion.* + ** If capabilities profile is not specified then Apex will select node's roles + in the OPNFV cluster in a non-deterministic fashion. Creating the Settings Files --------------------------- @@ -245,5 +246,5 @@ Follow the steps below to execute: 3. When the deployment is complete the undercloud IP and ovecloud dashboard url will be printed. OPNFV has now been deployed using Apex. -.. _`Execution Requirements (Bare Metal Only)`: requirements.html#execution-requirements-bare-metal-only -.. _`Network Requirements`: requirements.html#network-requirements +.. _`Execution Requirements (Bare Metal Only)`: index.html#execution-requirements-bare-metal-only +.. _`Network Requirements`: index.html#network-requirements diff --git a/docs/installationprocedure/virtualinstall.rst b/docs/installationprocedure/virtualinstall.rst index d2c81abe..db52601e 100644 --- a/docs/installationprocedure/virtualinstall.rst +++ b/docs/installationprocedure/virtualinstall.rst @@ -65,5 +65,5 @@ Verifying the Setup - VMs To verify the set you can follow the instructions in the `Verifying the Setup`_ section. -.. _`Install Bare Metal Jumphost`: baremetal.html -.. _`Verifying the Setup`: verification.html +.. _`Install Bare Metal Jumphost`: index.html#install-bare-metal-jumphost +.. _`Verifying the Setup`: index.html#verifying-the-setup diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst index 52b676ec..927c07c9 100644 --- a/docs/releasenotes/release-notes.rst +++ b/docs/releasenotes/release-notes.rst @@ -224,7 +224,6 @@ Software Deliverables - Apex .iso file - Apex overcloud .rpm (opnfv-apex) - For nosdn and OpenDaylight Scenarios - Apex overcloud onos .rpm (opnfv-apex-onos) - ONOS Scenarios -- Apex overcloud ODL SFC .rpm (opnfv-apex-opendaylight-sfc) - ODL SFC Scenario - Apex undercloud .rpm (opnfv-apex-undercloud) - Apex common .rpm (opnfv-apex-common) - build.sh - Builds the above artifacts |