Updates RPM specs and building

[apex.git] / docs / release / installation / baremetal.rst

diff --git a/docs/release/installation/baremetal.rst b/docs/release/installation/baremetal.rst
index 83cda32..c6ab9e8 100644 (file)
--- a/docs/release/installation/baremetal.rst
+++ b/docs/release/installation/baremetal.rst
@@ -50,7 +50,7 @@ images provided by the undercloud.  These disk images include all the necessary
 packages and configuration for an OPNFV deployment to execute.  Once the disk
 images have been written to node's disks the nodes will boot locally and
 execute cloud-init which will execute the final node configuration. This
-configuration is largly completed by executing a puppet apply on each node.
+configuration is largely completed by executing a puppet apply on each node.
 
 Installation High-Level Overview - VM Deployment
 ================================================
@@ -62,7 +62,7 @@ VM a collection of VMs (3 control nodes + 2 compute for an HA deployment or 1
 control node and 1 or more compute nodes for a Non-HA Deployment) will be
 defined for the target OPNFV deployment.  The part of the toolchain that
 executes IPMI power instructions calls into libvirt instead of the IPMI
-interfaces on baremetal servers to operate the power managment.  These VMs are
+interfaces on baremetal servers to operate the power management.  These VMs are
 then provisioned with the same disk images and configuration that baremetal
 would be.
 
@@ -94,7 +94,7 @@ 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 Newton Release RPM and epel-release:
+    install the RDO Newton Release RPM and epel-release:
 
     ``sudo yum install https://repos.fedorapeople.org/repos/openstack/openstack-newton/rdo-release-newton-4.noarch.rpm``
     ``sudo yum install epel-release``
@@ -117,29 +117,29 @@ Install Bare Metal Jumphost
     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``
+    ``sudo yum install http://artifacts.opnfv.org/apex/euphrates/opnfv-apex-release-euphrates.noarch.rpm``
 
     Once you have installed the repo definitions for Apex, RDO and EPEL then
     yum install Apex:
 
     ``sudo yum install opnfv-apex``
 
-    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
-    - python34-markupsafe         - (reqed) Dependency of opnfv-apex-common **
-    - python3-jinja2              - (reqed) Dependency of opnfv-apex-common **
-    - python3-ipmi                - (reqed) Dependency of opnfv-apex-common **
+    - opnfv-apex                 - OpenDaylight, OVN, and nosdn support *
+    - opnfv-apex-undercloud      - (reqed) Undercloud Image
+    - python34-opnfv-apex        - (reqed) OPNFV Apex Python package
+    - python34-markupsafe        - (reqed) Dependency of python34-opnfv-apex **
+    - python34-jinja2            - (reqed) Dependency of python34-opnfv-apex **
+    - python3-ipmi               - (reqed) Dependency of python34-opnfv-apex **
+    - python34-pbr               - (reqed) Dependency of python34-opnfv-apex **
+    - python34-virtualbmc        - (reqed) Dependency of python34-opnfv-apex **
+    - python34-iptables          - (reqed) Dependency of python34-opnfv-apex **
+    - python34-cryptography      - (reqed) Dependency of python34-opnfv-apex **
+    - python34-libvirt           - (reqed) Dependency of python34-opnfv-apex **
 
     \* One or more of these RPMs is required
     Only one of opnfv-apex or opnfv-apex-onos is required. It is safe to leave
@@ -162,7 +162,7 @@ Install Bare Metal Jumphost
     ``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``
+    opnfv-apex-undercloud-<version>.rpm python34-opnfv-apex-<version>.rpm``
 
 3.  After the operating system and the opnfv-apex RPMs are installed, login to
     your Jumphost as root.
@@ -235,7 +235,7 @@ help you customize them.
    (``/etc/opnfv-apex/``). These files are named with the naming convention
    os-sdn_controller-enabled_feature-[no]ha.yaml. These files can be used in
    place of the (``/etc/opnfv-apex/deploy_settings.yaml``) file if one suites
-   your deployment needs. If a pre-built deploy_settings file is choosen there
+   your deployment needs. If a pre-built deploy_settings file is chosen there
    is no need to customize (``/etc/opnfv-apex/deploy_settings.yaml``). The
    pre-built file can be used in place of the
    (``/etc/opnfv-apex/deploy_settings.yaml``) file.