Merge "Adding a release RPM"

2 files changed, 27 insertions, 12 deletions

diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst
index 878a49d7..2c231b60 100644
--- a/docs/installationprocedure/baremetal.rst
+++ b/docs/installationprocedure/baremetal.rst
@@ -94,9 +94,10 @@ Install Bare Metal Jumphost
     support is completed.
 
 1b. If your Jump host already has CentOS 7 with libvirt running on it then
-    install the install the RDO Release RPM:
+    install the install the RDO Newton Release RPM and epel-release:
 
-    ``sudo yum install -y https://www.rdoproject.org/repos/rdo-release.rpm``
+    ``sudo yum install https://repos.fedorapeople.org/repos/openstack/openstack-newton/rdo-release-newton-4.noarch.rpm``
+    ``sudo yum install epel-release``
 
     The RDO Project release repository is needed to install OpenVSwitch, which
     is a dependency of opnfv-apex. If you do not have external connectivity to
@@ -113,11 +114,26 @@ Install Bare Metal Jumphost
     the USB device as the boot media on your Jumphost
 
 2b. If your Jump host already has CentOS 7 with libvirt running on it then
-    install the opnfv-apex RPMs from the OPNFV artifacts site
-    <http://artifacts.opnfv.org/apex.html>. The following RPMS are available
-    for installation:
+    install the opnfv-apex RPMs using the OPNFV artifacts yum repo. This yum
+    repo is created at release. It will not exist before release day.
+
+    ``sudo yum install http://artifacts.opnfv.org/apex/danube/opnfv-apex-release-danube.noarch.rpm``
+
+    Once you have installed the repo definitions for Apex, RDO and EPEL then
+    yum install Apex:
+
+    ``sudo yum install opnfv-apex``
 
-    - opnfv-apex                  - OpenDaylight L2 / L3 and ONOS support *
+    If ONOS will be used, install the ONOS rpm instead of the opnfv-apex rpm.
+
+    ``sudo yum install opnfv-apex-onos``
+
+2c. If you choose not to use the Apex yum repo or you choose to use
+    pre-released RPMs you can download and install the required RPMs from the
+    artifacts site <http://artifacts.opnfv.org/apex.html>. The following RPMs
+    are available for installation:
+
+    - opnfv-apex                  - OpenDaylight L2 / L3 and ODL SFC support *
     - opnfv-apex-onos             - ONOS support *
     - opnfv-apex-undercloud       - (reqed) Undercloud Image
     - opnfv-apex-common           - (reqed) Supporting config files and scripts
@@ -136,20 +152,18 @@ Install Bare Metal Jumphost
     no longer carry them and they will not need special handling for
     installation.
 
-    Python 3.4 is also required and it needs to be installed if you are using
-    the Centos 7 base image:
 
+    The EPEL and RDO yum repos are still required:
     ``sudo yum install epel-release``
-    ``sudo yum install python34``
+    ``sudo yum install https://repos.fedorapeople.org/repos/openstack/openstack-newton/rdo-release-newton-4.noarch.rpm``
 
-    To install these RPMs download them to the local disk on your CentOS 7
-    install and pass the file names directly to yum:
+    Once the apex RPMs are downloaded install them by passing the file namesi
+    directly to yum:
     ``sudo yum install python34-markupsafe-<version>.rpm
     python3-jinja2-<version>.rpm python3-ipmi-<version>.rpm``
     ``sudo yum install opnfv-apex-<version>.rpm
     opnfv-apex-undercloud-<version>.rpm opnfv-apex-common-<version>.rpm``
 
-
 3.  After the operating system and the opnfv-apex RPMs are installed, login to
     your Jumphost as root.
 
diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst
index f873d835..3e6e0aac 100644
--- a/docs/releasenotes/release-notes.rst
+++ b/docs/releasenotes/release-notes.rst
@@ -222,6 +222,7 @@ Deliverables
 Software Deliverables
 ~~~~~~~~~~~~~~~~~~~~~
 - Apex .iso file
+- Apex release .rpm (opnfv-apex-release)
 - Apex overcloud .rpm (opnfv-apex) - For nosdn and OpenDaylight Scenarios
 - Apex overcloud onos .rpm (opnfv-apex-onos) - ONOS Scenarios
 - Apex undercloud .rpm (opnfv-apex-undercloud)