diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-10-19 12:50:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-19 12:50:02 +0000 |
| commit | 1513de7f3d75e93b83ebc88b0d40880985f67400 (patch) | |
| tree | 49db9ef76541e7485e40481762813a8acbe2f908 /docs | |
| parent | ce74e17298db0422734fe8ac820cb61b1e5ae601 (diff) | |
| parent | b3840e9981c007e26eb7cbdf94f66d0f58a6e3f7 (diff) | |
Merge "Consolidate ODL SFC RPM into ODL RPM" into stable/colorado
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/installationprocedure/baremetal.rst | 7 | ||||
| -rw-r--r-- | docs/releasenotes/release-notes.rst | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst index d41c77e0..21dc444e 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 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 |