diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-10-12 11:28:57 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-10-18 14:59:10 +0000 |
| commit | b3840e9981c007e26eb7cbdf94f66d0f58a6e3f7 (patch) | |
| tree | 1b114aa81dbeac77f964f82feedb3ca0016e4935 /docs | |
| parent | 08c991dd086f4c4d094e232d0dfb39c760eff521 (diff) | |
Consolidate ODL SFC RPM into ODL RPM
OVS NSH can be installed at deploy time.
Change-Id: Ie875ada99053df95c6534e269f4dd627396489bc
JIRA: APEX-324
Signed-off-by: Dan Radez <dradez@redhat.com>
(cherry picked from commit 0f866cf4bfd57c28a754f274582887c943694953)
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 |