Merge "Document available deployment options" into stable/colorado

diff --combined docs/installationprocedure/baremetal.rst
index eb48a28,0a6e324..d41c77e
--- 1/docs/installationprocedure/baremetal.rst
--- 2/docs/installationprocedure/baremetal.rst
+++ b/docs/installationprocedure/baremetal.rst
@@@ -137,12 -137,6 +137,12 @@@ Install Bare Metal Jumphos
      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
@@@ -205,7 -199,8 +205,8 @@@ Edit the 2 settings files in /etc/opnfv
  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