Fixes missing iommu parameters in odl_l2 fdio ha scenario

[apex.git] / docs / installationprocedure / baremetal.rst

diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst
index 8507b44..3224dd9 100644 (file)
--- 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
@@ -137,6 +136,12 @@ 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:
+
+    ``sudo yum install epel-release``
+    ``sudo yum install python34``
+
     To install these RPMs download them to the local disk on your CentOS 7
     install and pass the file names directly to yum:
     ``sudo yum install python34-markupsafe-<version>.rpm
@@ -199,7 +204,8 @@ Edit the 2 settings files in /etc/opnfv-apex/. These files have comments to
 help you customize them.
 
 1. deploy_settings.yaml
-   This file includes basic configuration options deployment.
+   This file includes basic configuration options deployment, and also documents
+   all available options.
    Alternatively, there are pre-built deploy_settings files available in
    (``/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
@@ -223,11 +229,10 @@ You are now ready to deploy OPNFV using Apex!
 Follow the steps below to execute:
 
 1.  Execute opnfv-deploy
-    ``sudo opnfv-deploy [ --flat ] -n network_settings.yaml
+    ``sudo opnfv-deploy -n network_settings.yaml
     -i inventory.yaml -d deploy_settings.yaml``
     If you need more information about the options that can be passed to
-    opnfv-deploy use ``opnfv-deploy --help`` --flat collapses all networks to a
-    single nic, only uses the admin network from the network settings file.  -n
+    opnfv-deploy use ``opnfv-deploy --help``.  -n
     network_settings.yaml allows you to customize your networking topology.
 
 2.  Wait while deployment is executed.