Update documentation for SR1 release

JIRA: APEX-21

Change-Id: Iea656b3a6f8bc9571920afa8f5ba63036ac5c653
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 37c01214db85cbd5a3940bf5cdb9ff12e260149e)

2 files changed, 351 insertions, 99 deletions

diff --git a/foreman/docs/src/installation-instructions.rst b/foreman/docs/src/installation-instructions.rst
index 20ea983..8d30586 100644
--- a/foreman/docs/src/installation-instructions.rst
+++ b/foreman/docs/src/installation-instructions.rst
@@ -10,13 +10,16 @@ OPNFV Installation instructions for the Arno release of OPNFV when using Foreman
 Abstract
 ========
 
-This document describes how to install the Arno release of OPNFV when using Foreman/Quickstack as a deployment tool covering it's limitations, dependencies and required system resources.
+This document describes how to install the Arno SR1 release of OPNFV when using Foreman/Quickstack as a
+deployment tool covering it's limitations, dependencies and required system resources.
 
 License
 =======
-Arno release of OPNFV when using Foreman as a deployment tool Docs (c) by Tim Rozet (RedHat)
+Arno SR1 release of OPNFV when using Foreman as a deployment tool Docs (c) by Tim Rozet (RedHat)
 
-Arno release of OPNFV when using Foreman as a deployment tool Docs are licensed under a Creative Commons Attribution 4.0 International License. You should have received a copy of the license along with this. If not, see <http://creativecommons.org/licenses/by/4.0/>.
+Arno SR1 release of OPNFV when using Foreman as a deployment tool Docs are licensed under a Creative
+Commons Attribution 4.0 International License. You should have received a copy of the license along
+with this. If not, see <http://creativecommons.org/licenses/by/4.0/>.
 
 Version history
 ===================
@@ -37,25 +40,38 @@ Version history
 | 2015-06-03         | 0.0.4              | Ildiko Vancsa      | Minor changes      |
 |                    |                    | (Ericsson)         |                    |
 +--------------------+--------------------+--------------------+--------------------+
-
+| 2015-09-10         | 0.2.0              | Tim Rozet          | Update to SR1      |
+|                    |                    | (Red Hat)          |                    |
++--------------------+--------------------+--------------------+--------------------+
 
 Introduction
 ============
 
-This document describes the steps to install an OPNFV Arno reference platform, as defined by the Bootstrap/Getting-Started (BGS) Project using the Foreman/QuickStack installer.
+This document describes the steps to install an OPNFV Arno SR1 reference platform, as defined by the
+Bootstrap/Getting-Started (BGS) Project using the Foreman/QuickStack installer.
 
 The audience is assumed to have a good background in networking and Linux administration.
 
 Preface
 =======
 
-Foreman/QuickStack uses the Foreman Open Source project as a server management tool, which in turn manages and executes Genesis/QuickStack.  Genesis/QuickStack consists of layers of Puppet modules that are capable of provisioning the OPNFV Target System (3 controllers, n number of compute nodes).
+Foreman/QuickStack uses the Foreman Open Source project as a server management tool, which in turn
+manages and executes Genesis/QuickStack.  Genesis/QuickStack consists of layers of Puppet modules that
+are capable of provisioning the OPNFV Target System (3 controllers, n number of compute nodes).
 
-The Genesis repo contains the necessary tools to get install and deploy an OPNFV target system using Foreman/QuickStack.  These tools consist of the Foreman/QuickStack bootable ISO (``arno.2015.1.0.foreman.iso``), and the automatic deployment script (``deploy.sh``).
+The Genesis repo contains the necessary tools to get install and deploy an OPNFV target system using
+Foreman/QuickStack.  These tools consist of the Foreman/QuickStack bootable ISO
+(``arno.2015.2.0.foreman.iso``), and the automatic deployment script (``deploy.sh``).
 
-An OPNFV install requires a "Jumphost" in order to operate.  The bootable ISO will allow you to install a customized CentOS 7 release to the Jumphost, which then gives you the required packages needed to run ``deploy.sh``.  If you already have a Jumphost with CentOS 7 installed, you may choose to ignore the ISO step and instead move directly to running ``deploy.sh``.  In this case, ``deploy.sh`` will install the necessary packages for you in order to execute.
+An OPNFV install requires a "Jumphost" in order to operate.  The bootable ISO will allow you to install
+a customized CentOS 7 release to the Jumphost, which then gives you the required packages needed to
+run ``deploy.sh``.  If you already have a Jumphost with CentOS 7 installed, you may choose to ignore
+the ISO step and instead move directly to cloning the git repository and running ``deploy.sh``.  In
+this case, ``deploy.sh`` will install the necessary packages for you in order to execute.
 
-``deploy.sh`` installs Foreman/QuickStack VM server using Vagrant with VirtualBox as its provider.  This VM is then used to provision the OPNFV target system (3 controllers, n compute nodes).  These nodes can be either virtual or bare metal. This guide contains instructions for installing both.
+``deploy.sh`` installs Foreman/QuickStack VM server using Vagrant with VirtualBox as its provider.
+This VM is then used to provision the OPNFV target system (3 controllers, n compute nodes).  These
+nodes can be either virtual or bare metal. This guide contains instructions for installing both.
 
 Setup Requirements
 ==================
@@ -71,26 +87,30 @@ The Jumphost requirements are outlined below:
 
 3.     libvirt or other hypervisors disabled (no kernel modules loaded).
 
-4.     3-4 NICs, untagged (no 802.1Q tagging), with IP addresses.
+4.     3-4 NICs for bare metal deployment/only 1 NIC required for virtual deployment, untagged
+(no 802.1Q tagging), with IP addresses.
 
 5.     Internet access for downloading packages, with a default gateway configured.
 
-6.     4 GB of RAM for a bare metal deployment, 24 GB of RAM for a VM deployment.
+6.     4 GB of RAM for a bare metal deployment, 18 GB (HA) or 8 GB (non-HA) of RAM for a VM deployment.
 
 Network Requirements
 --------------------
 
 Network requirements include:
 
-1.     No DHCP or TFTP server running on networks used by OPNFV.
+1.     No DHCP or TFTP server running on networks used by OPNFV (bare metal deployment only).
 
-2.     3-4 separate VLANs (untagged) with connectivity between Jumphost and nodes (bare metal deployment only).  These make up the admin, private, public and optional storage networks.
+2.     1, 3, or 4 separate VLANs (untagged) with connectivity between Jumphost and nodes (bare metal
+deployment only).  These make up the admin, private, public and optional storage networks.  If only
+1 VLAN network used for baremetal, then all of the previously listed logical networks will be
+consolidated to that single network.
 
 3.     Lights out OOB network access from Jumphost with IPMI node enabled (bare metal deployment only).
 
 4.     Admin or public network has Internet access, meaning a gateway and DNS availability.
 
-*Note: Storage network will be consolidated to the private network if only 3 networks are used.*
+**Note: Storage network will be consolidated to the private network if only 3 networks are used.**
 
 Bare Metal Node Requirements
 ----------------------------
@@ -116,46 +136,83 @@ In order to execute a deployment, one must gather the following information:
 
 4.     MAC address of private interfaces on 3 nodes that will be controllers.
 
+**Note: For single NIC/network barmetal deployment, the MAC address of the admin and private
+interface will be the same.**
 
 Installation High-Level Overview - Bare Metal Deployment
 ========================================================
 
-The setup presumes that you have 6 bare metal servers and have already setup connectivity on at least 3 interfaces for all servers via a TOR switch or other network implementation.
+The setup presumes that you have 6 bare metal servers and have already setup connectivity on at least
+1 or 3 interfaces for all servers via a TOR switch or other network implementation.
 
-The physical TOR switches are **not** automatically configured from the OPNFV reference platform. All the networks involved in the OPNFV infrastructure as well as the provider networks and the private tenant VLANs needs to be manually configured.
+The physical TOR switches are **not** automatically configured from the OPNFV reference platform. All
+the networks involved in the OPNFV infrastructure as well as the provider networks and the private
+tenant VLANs needs to be manually configured.
 
-The Jumphost can be installed using the bootable ISO.  The Jumphost should then be configured with an IP gateway on its admin or public interface and configured with a working DNS server.  The Jumphost should also have routable access to the lights out network.
+The Jumphost can be installed using the bootable ISO.  The Jumphost should then be configured with an
+IP gateway on its admin or public interface and configured with a working DNS server.  The Jumphost
+should also have routable access to the lights out network.
 
-``deploy.sh`` is then executed in order to install the Foreman/QuickStack Vagrant VM.  ``deploy.sh`` uses a configuration file with YAML format in order to know how to install and provision the OPNFV target system.  The information gathered under section `Execution Requirements (Bare Metal Only)`_ is put into this configuration file.
+``deploy.sh`` is then executed in order to install the Foreman/QuickStack Vagrant VM.  ``deploy.sh``
+uses a configuration file with YAML format in order to know how to install and provision the OPNFV
+target system.  The information gathered under section `Execution Requirements (Bare Metal Only)`_
+is put into this configuration file.
 
-``deploy.sh`` brings up a CentOS 7 Vagrant VM, provided by VirtualBox.  The VM then executes an Ansible project called Khaleesi in order to install Foreman and QuickStack.  Once the Foreman/QuickStack VM is up, Foreman will be configured with the nodes' information.  This includes MAC address, IPMI, OpenStack type (controller, compute, OpenDaylight controller) and other information.  At this point Khaleesi makes a REST API call to Foreman to instruct it to provision the hardware.
+``deploy.sh`` brings up a CentOS 7 Vagrant VM, provided by VirtualBox.  The VM then executes an
+Ansible project called Khaleesi in order to install Foreman and QuickStack.  Once the
+Foreman/QuickStack VM is up, Foreman will be configured with the nodes' information.  This includes
+MAC address, IPMI, OpenStack type (controller, compute, OpenDaylight controller) and other information.
+At this point Khaleesi makes a REST API call to Foreman to instruct it to provision the hardware.
 
-Foreman will then reboot the nodes via IPMI.  The nodes should already be set to PXE boot first off the admin interface.  Foreman will then allow the nodes to PXE and install CentOS 7 as well as Puppet.  Foreman/QuickStack VM server runs a Puppet Master and the nodes query this master to get their appropriate OPNFV configuration.  The nodes will then reboot one more time and once back up, will DHCP on their private, public and storage NICs to gain IP addresses.  The nodes will now check in via Puppet and start installing OPNFV.
+Foreman will then reboot the nodes via IPMI.  The nodes should already be set to PXE boot first off the
+admin interface.  Foreman will then allow the nodes to PXE and install CentOS 7 as well as Puppet.
+Foreman/QuickStack VM server runs a Puppet Master and the nodes query this master to get their
+appropriate OPNFV configuration.  The nodes will then reboot one more time and once back up, will DHCP
+on their private, public and storage NICs to gain IP addresses.  The nodes will now check in via
+Puppet and start installing OPNFV.
 
-Khaleesi will wait until these nodes are fully provisioned and then return a success or failure based on the outcome of the Puppet application.
+Khaleesi will wait until these nodes are fully provisioned and then return a success or failure based
+on the outcome of the Puppet application.
 
 Installation High-Level Overview - VM Deployment
 ================================================
 
-The VM nodes deployment operates almost the same way as the bare metal deployment with a few differences.  ``deploy.sh`` still installs Foreman/QuickStack VM the exact same way, however the part of the Khaleesi Ansible playbook which IPMI reboots/PXE boots the servers is ignored.  Instead, ``deploy.sh`` brings up N number more Vagrant VMs (where N is 3 control nodes + n compute).  These VMs already come up with CentOS 7 so instead of re-provisioning the entire VM, ``deploy.sh`` initiates a small Bash script that will signal to Foreman that those nodes are built and install/configure Puppet on them.
+The VM nodes deployment operates almost the same way as the bare metal deployment with a few
+differences.  ``deploy.sh`` still installs Foreman/QuickStack VM the exact same way, however the part
+of the Khaleesi Ansible playbook which IPMI reboots/PXE boots the servers is ignored.  Instead,
+``deploy.sh`` brings up N number more Vagrant VMs (where N is 3 control nodes + n compute).  These VMs
+already come up with CentOS 7 so instead of re-provisioning the entire VM, ``deploy.sh`` initiates a
+small Bash script that will signal to Foreman that those nodes are built and install/configure Puppet
+on them.
 
 To Foreman these nodes look like they have just built and register the same way as bare metal nodes.
 
+VM deployment will automatically use the default gateway interface on the host for all of the VMs
+internet access via bridging the VMs NICs (public network).  The other networks - such as admin,
+private, storage will all be created as internal VirtualBox networks.  Therefore only a single
+interface on the host is needed for VM deployment.
+
 Installation Guide - Bare Metal Deployment
 ==========================================
 
-This section goes step-by-step on how to correctly install and provision the OPNFV target system to bare metal nodes.
+This section goes step-by-step on how to correctly install and provision the OPNFV target system to
+bare metal nodes.
 
 Install Bare Metal Jumphost
 ---------------------------
 
-1.  If your Jumphost does not have CentOS 7 already on it, or you would like to do a fresh install, then download the Foreman/QuickStack bootable ISO <http://artifacts.opnfv.org/arno.2015.1.0/foreman/arno.2015.1.0.foreman.iso> here.
+1.  If your Jumphost does not have CentOS 7 already on it, or you would like to do a fresh install,
+then download the Foreman/QuickStack bootable ISO
+<http://artifacts.opnfv.org/arno.2015.2.0/foreman/arno.2015.2.0.foreman.iso> here.  If you already
+have a CentOS 7 install that you would like to use then go to step 3.
 
 2.  Boot the ISO off of a USB or other installation media and walk through installing OPNFV CentOS 7.
 
-3.  After OS is installed login to your Jumphost as root.
+3.  After OS is installed login to your Jumphost as root.  If /root/genesis does not exist then
+``git clone -b arno.2015.2.0 https://gerrit.opnfv.org/gerrit/genesis /root/genesis``
 
-4.  Configure IP addresses on 3-4 interfaces that you have selected as your admin, private, public, and storage (optional) networks.
+4.  Configure IP addresses on 3-4 interfaces that you have selected as your admin, private, public,
+and storage (optional) networks.
 
 5.  Configure the IP gateway to the Internet either, preferably on the public interface.
 
@@ -174,15 +231,25 @@ Install Bare Metal Jumphost
 Creating an Inventory File
 --------------------------
 
-You now need to take the MAC address/IPMI info gathered in section `Execution Requirements (Bare Metal Only)`_ and create the YAML inventory (also known as configuration) file for ``deploy.sh``.
+You now need to take the MAC address/IPMI info gathered in section
+`Execution Requirements (Bare Metal Only)`_ and create the YAML inventory (also known as configuration)
+file for ``deploy.sh``.
 
-1.  Copy the ``opnfv_ksgen_settings.yml`` file from ``/root/bgs_vagrant/`` to another directory and rename it to be what you want EX: ``/root/my_ksgen_settings.yml``
+1.  Copy the ``opnfv_ksgen_settings.yml`` file (for HA) or ``opnfv_ksgen_settings_no_HA.yml`` from
+``/root/genesis/foreman/ci/`` to another directory and rename it to be what you want Example:
+``/root/my_ksgen_settings.yml``
 
-2.  Edit the file in your favorite editor.  There is a lot of information in this file, but you really only need to be concerned with the "nodes:" dictionary.
+2.  Edit the file in your favorite editor.  There is a lot of information in this file, but you
+really only need to be concerned with the "nodes:" dictionary.
 
-3.  The nodes dictionary contains each bare metal host you want to deploy.  You can have 1 or more compute nodes and must have 3 controller nodes (these are already defined for you).  It is optional at this point to add more compute nodes into the dictionary.  You must use a different name, hostname, short_name and dictionary keyname for each node.
+3.  The nodes dictionary contains each bare metal host you want to deploy.  You can have 1 or more
+compute nodes and must have 3 controller nodes (these are already defined for you) if ha_flag is set
+to true.  If ha_flag is set to false, please only define 1 controller node.  It is optional at this
+point to add more compute nodes into the dictionary.  You must use a different name, hostname,
+short_name and dictionary keyname for each node.
 
-4.  Once you have decided on your node definitions you now need to modify the MAC address/IPMI info dependent on your hardware.  Edit the following values for each node:
+4.  Once you have decided on your node definitions you now need to modify the MAC address/IPMI info
+dependent on your hardware.  Edit the following values for each node:
 
     - ``mac_address``: change to MAC address of that node's admin NIC (defaults to 1st NIC)
     - ``bmc_ip``: change to IP Address of BMC (out-of-band)/IPMI IP
@@ -194,43 +261,68 @@ You now need to take the MAC address/IPMI info gathered in section `Execution Re
 
     - ``private_mac`` - change to MAC address of node's private NIC (default to 2nd NIC)
 
-6.  Save your changes.
+6.  You may also define a unique domain name by editing the ``domain_name`` global parameter.
+
+7.  Save your changes.
 
 Running ``deploy.sh``
 ---------------------
 
-You are now ready to deploy OPNFV!  ``deploy.sh`` will use your ``/tmp/`` directory to store its Vagrant VMs.  Your Foreman/QuickStack Vagrant VM will be running out of ``/tmp/bgs_vagrant``.
+You are now ready to deploy OPNFV!  ``deploy.sh`` will use your ``/var/opt/opnfv/`` directory to store
+its Vagrant VMs.  Your Foreman/QuickStack Vagrant VM will be running out of
+``/var/opt/opnfv/foreman_vm/``.
 
-It is also recommended that you power off your nodes before running ``deploy.sh``  If there are DHCP servers or other network services that are on those nodes it may conflict with the installation.
+It is also recommended that you power off your nodes before running ``deploy.sh``  If there are DHCP
+servers or other network services that are on those nodes it may conflict with the installation.
 
 Follow the steps below to execute:
 
-1.  ``cd /root/bgs_vagrant``
+1.  ``cd /root/genesis/foreman/ci/``
 
-2.  ``./deploy.sh -base_config </root/my_ksgen_settings.yml>``
+2.  ``./deploy.sh -base_config /root/my_ksgen_settings.yml``
 
-3.  It will take about 20-25 minutes to install Foreman/QuickStack VM.  If something goes wrong during this part of the process, it is most likely a problem with the setup of your Jumphost.  You will also notice different outputs in your shell.  When you see messages that say "TASK:" or "PLAY:" this is Khalessi running and installing Foreman/QuickStack inside of your VM or deploying your nodes.  Look for "PLAY [Deploy Nodes]" as a sign that Foreman/QuickStack is finished installing and now your nodes are being rebuilt.
+**Note:  This is for default detection of at least 3 VLAN/interfaces configured on your jumphost
+with defaulting interface assignment by the NIC order (1st Admin, 2nd Private, 3rd Public).  If you
+wish to use a single interface for baremetal install, see help output for "-single_baremetal_nic".
+If you would like to specify the NIC mapping to logical network, see help output for "-admin_nic",
+"-private_nic", "-public_nic", "-storage_nic".**
 
-4.  Your nodes will take 40-60 minutes to re-install CentOS 7 and install/configure OPNFV.  When complete you will see "Finished: SUCCESS"
+3.  It will take about 20-25 minutes to install Foreman/QuickStack VM.  If something goes wrong during
+this part of the process, it is most likely a problem with the setup of your Jumphost.  You will also
+notice different outputs in your shell.  When you see messages that say "TASK:" or "PLAY:" this is
+Khalessi running and installing Foreman/QuickStack inside of your VM or deploying your nodes.  Look
+for "PLAY [Deploy Nodes]" as a sign that Foreman/QuickStack is finished installing and now your nodes
+are being rebuilt.
+
+4.  Your nodes will take 40-60 minutes to re-install CentOS 7 and install/configure OPNFV.  When
+complete you will see "Finished: SUCCESS"
 
 Verifying the Setup
 -------------------
 
-Now that the installer has finished it is a good idea to check and make sure things are working correctly.  To access your Foreman/QuickStack VM:
+Now that the installer has finished it is a good idea to check and make sure things are working
+correctly.  To access your Foreman/QuickStack VM:
 
-1.  ``cd /tmp/bgs_vagrant``
+1.  ``cd /var/opt/opnfv/foreman_vm/``
 
 2.  ``vagrant ssh`` (password is "vagrant")
 
-3.  You are now in the VM and can check the status of Foreman service, etc.  For example: ``systemctl status foreman``
+3.  You are now in the VM and can check the status of Foreman service, etc.  For example:
+``systemctl status foreman``
 
-4.  Type "exit" and leave the Vagrant VM.  Now execute: ``cat /tmp/bgs_vagrant/opnfv_ksgen_settings.yml | grep foreman_url``
+4.  Type "exit" and leave the Vagrant VM.  Now execute:
+``cat /var/opt/opnfv/foreman_vm/opnfv_ksgen_settings.yml | grep foreman_url``
 
-5.  This is your Foreman URL on your public interface.  You can go to your web browser, ``http://<foreman_ip>``, login will be "admin"/"octopus".  This way you can look around in Foreman and check that your hosts are in a good state, etc.
+5.  This is your Foreman URL on your public interface.  You can go to your web browser,
+``http://<foreman_ip>``, login will be "admin"/"octopus".  This way you can look around in Foreman and
+check that your hosts are in a good state, etc.
 
-6.  In Foreman GUI, you can now go to Infrastructure -> Global Parameters.  This is a list of all the variables being handed to Puppet for configuring OPNFV.  Look for ``horizon_public_vip``.  This is your IP address to Horizon GUI.
+6.  In Foreman GUI, you can now go to Infrastructure -> Global Parameters.  This is a list of all the
+variables being handed to Puppet for configuring OPNFV.  Look for ``horizon_public_vip``.  This is
+your IP address to Horizon GUI.
 
-    **Note: You can find out more about how to ues Foreman by going to http://www.theforeman.org/ or by watching a walkthrough video here: https://bluejeans.com/s/89gb/**
+**Note: You can find out more about how to use Foreman by going to http://www.theforeman.org/ or
+by watching a walkthrough video here: https://bluejeans.com/s/89gb/**
 
 7.  Now go to your web browser and insert the Horizon public VIP.  The login will be "admin"/"octopus".
 
@@ -239,7 +331,8 @@ Now that the installer has finished it is a good idea to check and make sure thi
 OpenStack Verification
 ----------------------
 
-Now that you have Horizon access, let's make sure OpenStack the OPNFV target system are working correctly:
+Now that you have Horizon access, let's make sure OpenStack the OPNFV target system are working
+correctly:
 
 1.  In Horizon, click Project -> Compute -> Volumes, Create Volume
 
@@ -247,7 +340,8 @@ Now that you have Horizon access, let's make sure OpenStack the OPNFV target sys
 
 3.  Now in the left pane, click Compute -> Images, click Create Image
 
-4.  Insert a name "cirros", Insert an Image Location ``http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img``
+4.  Insert a name "cirros", Insert an Image Location
+``http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img``
 
 5.  Select format "QCOW2", select Public, then hit Create Image
 
@@ -259,62 +353,129 @@ Now that you have Horizon access, let's make sure OpenStack the OPNFV target sys
 
 9.  Enter ``10.0.0.5,10.0.0.9`` under Allocation Pools, then hit Create
 
-10. Now go to Project -> Compute -> Instances, click Launch Instance
+**Note: You may also want to expand this pool by giving a larger range,
+or you can simply hit Create with entering nothing and the entire subnet
+range will be used for DHCP**
+
+10. Go to Project -> Network -> Routers
+
+11. Click "provider_router".  Then select "Add Interface"
+
+12. From the pop up menu, select test_subnet in the "Subnet" field.  Press "Add interface"
+
+13. Verify your Network Topology looks correct in Project -> Network -> Network Topology
+
+14. Now go to Project -> Compute -> Instances, click Launch Instance
+
+15. Enter Instance Name "cirros1", select Instance Boot Source "Boot from image", and then select
+Image Name "cirros"
+
+16. Click Launch, status should show "Spawning" while it is being built
+
+17. You can now repeat steps 15 and 16, but create a "cirros2" named instance
+
+18. Once both instances are up you can see their IP addresses on the Instances page.  Click the
+Instance Name of cirros1.
+
+19. Now click the "Console" tab and login as "cirros"/"cubswin:)"
 
-11. Enter Instance Name "cirros1", select Instance Boot Source "Boot from image", and then select Image Name "cirros"
+20. Verify you can ping the IP address of cirros2
 
-12. Click Launch, status should show "Spawning" while it is being built
+21. Continue to the next steps to provide external network access to cirros1.
 
-13. You can now repeat steps 11 and 12, but create a "cirros2" named instance
+22. Go to Project -> Compute -> Instances.  From the drop down menu under "Actions" select
+"Associate Floating IP"
 
-14. Once both instances are up you can see their IP addresses on the Instances page.  Click the Instance Name of cirros1.
+23. Press the "+" symbol next under "IP Address".  Select "Allocate IP" on the new pop up.
 
-15. Now click the "Console" tab and login as "cirros"/"cubswin" :)
+24. You should now see an external IP address filled into the "IP Address" field.  Click
+"Associate".
 
-16. Verify you can ping the IP address of cirros2
+25. Now from your external network you should be able to ping/ssh to the floating IP address.
 
 Congratulations you have successfully installed OPNFV!
 
 Installation Guide - VM Deployment
 ==================================
 
-This section goes step-by-step on how to correctly install and provision the OPNFV target system to VM nodes.
+This section goes step-by-step on how to correctly install and provision the OPNFV target system
+to VM nodes.
 
 Install Jumphost
 ----------------
 
-Follow the instructions in the `Install Bare Metal Jumphost`_ section.
+Follow the instructions in the `Install Bare Metal Jumphost`_ section, except that you only need 1
+network interface on the host system with internet connectivity.
+
+Creating an Inventory File
+--------------------------
+
+It is optional to create an inventory file for virtual deployments.  Since the nodes are virtual you
+are welcome to use the provided opnfv_ksgen_settings files.  You may also elect to customize your
+deployment.  Those options include modifying domain name of your deployment as well as allocating
+specific resources per node.
+
+Modifying VM resources is necessary for bigger virtual deployments in order to run more nova
+instances.  To modify these resources you can edit each of the follow node paramters in the
+Inventory file:
+
+1.  memory - set in KiB
+
+2.  cpus - number of vcpus to allocate to this VM
+
+3.  disk - size in GB (cannot be less than 40)
 
 Running ``deploy.sh``
----------------------------
+---------------------
 
-You are now ready to deploy OPNFV!  ``deploy.sh`` will use your ``/tmp/`` directory to store its Vagrant VMs.  Your Foreman/QuickStack Vagrant VM will run out of ``/tmp/bgs_vagrant``.  Your compute and subsequent controller nodes will run in:
+You are now ready to deploy OPNFV!  ``deploy.sh`` will use your ``/var/opt/opnfv/`` directory to store
+its Vagrant VMs.  Your Foreman/QuickStack Vagrant VM will run out of ``/var/opt/opnfv/foreman_vm/``.
+Your compute and subsequent controller nodes will run in:
 
-- ``/tmp/compute``
-- ``/tmp/controller1``
-- ``/tmp/controller2``
-- ``/tmp/controller3``
+- ``/var/opt/opnfv/compute``
+- ``/var/opt/opnfv/controller1``
+- ``/var/opt/opnfv/controller2``
+- ``/var/opt/opnfv/controller3``
 
-Each VM will be brought up and bridged to your Jumphost NICs.  ``deploy.sh`` will first bring up your Foreman/QuickStack Vagrant VM and afterwards it will bring up each of the nodes listed above, in order.
+Each VM will be brought up and bridged to your Jumphost NIC for the public network.  ``deploy.sh`` will
+first bring up your Foreman/QuickStack Vagrant VM and afterwards it will bring up each of the nodes
+listed above, in order of controllers first.
 
 Follow the steps below to execute:
 
-1.  ``cd /root/bgs_vagrant``
+1.  ``cd /root/genesis/foreman/ci/``
+
+2.  ``./deploy.sh -virtual -static_ip_range <your_range>``, Where <your_range> is a range of at least
+20 IP addresses (non-HA you need only 5) that are useable on your public subnet.
+``Ex: -static_ip_range 192.168.1.101,192.168.1.120``
 
-2.  ``./deploy.sh -virtual``
+**Note: You may also wish to use other options like manually selecting the NIC to be used on your host,
+etc.  Please use ``deploy.sh -h`` to see a full list of options available.**
 
-3.  It will take about 20-25 minutes to install Foreman/QuickStack VM.  If something goes wrong during this part of the process, it is most likely a problem with the setup of your Jumphost.  You will also notice different outputs in your shell.  When you see messages that say "TASK:" or "PLAY:" this is Khalessi running and installing Foreman/QuickStack inside of your VM or deploying your nodes.  When you see "Foreman is up!", that means deploy will now move on to bringing up your other nodes.
+3.  It will take about 20-25 minutes to install Foreman/QuickStack VM.  If something goes wrong during
+this part of the process, it is most likely a problem with the setup of your Jumphost.  You will also
+notice different outputs in your shell.  When you see messages that say "TASK:" or "PLAY:" this is
+Khalessi running and installing Foreman/QuickStack inside of your VM or deploying your nodes.  When
+you see "Foreman is up!", that means deploy will now move on to bringing up your other nodes.
 
-4.  ``deploy.sh`` will now bring up your other nodes, look for logging messages like "Starting Vagrant Node <node name>", "<node name> VM is up!"  These are indicators of how far along in the process you are.  ``deploy.sh`` will start each Vagrant VM, then run provisioning scripts to inform Foreman they are built and initiate Puppet.
+4.  ``deploy.sh`` will now bring up your other nodes, look for logging messages like "Starting Vagrant
+Node <node name>", "<node name> VM is up!"  These are indicators of how far along in the process you
+are.  ``deploy.sh`` will start each Vagrant VM, then run provisioning scripts to inform Foreman they
+are built and initiate Puppet.
 
-5.  The speed at which nodes are provisioned is totally dependent on your Jumphost server specs.  When complete you will see "All VMs are UP!"
+5.  The speed at which nodes are provisioned is totally dependent on your Jumphost server specs.  When
+complete you will see "All VMs are UP!"
+
+6.  The deploy will then print out the URL for your foreman server as well as the URL to access horizon.
 
 Verifying the Setup - VMs
 -------------------------
 
 Follow the instructions in the `Verifying the Setup`_ section.
 
-Also, for VM deployment you are able to easily access your nodes by going to ``/tmp/<node name>`` and then ``vagrant ssh`` (password is "vagrant").  You can use this to go to a controller and check OpenStack services, OpenDaylight, etc.
+Also, for VM deployment you are able to easily access your nodes by going to
+``/var/opt/opnfv/<node name>`` and then ``vagrant ssh`` (password is "vagrant").  You can use this to
+go to a controller and check OpenStack services, OpenDaylight, etc.
 
 OpenStack Verification - VMs
 ----------------------------
@@ -324,10 +485,13 @@ Follow the steps in `OpenStack Verification`_ section.
 Frequently Asked Questions
 ==========================
 
+Please see the `Arno FAQ <https://wiki.opnfv.org/releases/arno/faq>`_.
+
 License
 =======
 
-All Foreman/QuickStack and "common" entities are protected by the `Apache 2.0 License <http://www.apache.org/licenses/>`_.
+All Foreman/QuickStack and "common" entities are protected by the
+`Apache 2.0 License <http://www.apache.org/licenses/>`_.
 
 References
 ==========
@@ -349,11 +513,13 @@ OpenStack
 OpenDaylight
 ------------
 
-Upstream OpenDaylight provides `a number of packaging and deployment options <https://wiki.opendaylight.org/view/Deployment>`_ meant for consumption by downstream projects like OPNFV.
-
-Currently, OPNFV Foreman uses `OpenDaylight's Puppet module <https://github.com/dfarrell07/puppet-opendaylight>`_, which in turn depends on `OpenDaylight's RPM <https://copr.fedoraproject.org/coprs/dfarrell07/OpenDaylight/>`_.
+Upstream OpenDaylight provides `a number of packaging and deployment options
+<https://wiki.opendaylight.org/view/Deployment>`_ meant for consumption by downstream projects like
+OPNFV.
 
-Note that the RPM is currently hosted on Copr, but `will soon <https://trello.com/c/qseotfgL/171-host-odl-rpm-on-odl-infra>`_ be migrated to OpenDaylight's infrastructure and/or the new CentOS NFV SIG.
+Currently, OPNFV Foreman uses
+`OpenDaylight's Puppet module <https://github.com/dfarrell07/puppet-opendaylight>`_, which in turn
+depends on `OpenDaylight's RPM <http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/>`_.
 
 Foreman
 -------
@@ -361,7 +527,7 @@ Foreman
 `Foreman documentation <http://theforeman.org/documentation.html>`_
 
 :Authors: Tim Rozet (trozet@redhat.com)
-:Version: 0.0.3
+:Version: 0.2.0
 
 **Documentation tracking**
 
diff --git a/foreman/docs/src/release-notes.rst b/foreman/docs/src/release-notes.rst
index f9fcb37..fbeeccf 100644
--- a/foreman/docs/src/release-notes.rst
+++ b/foreman/docs/src/release-notes.rst
@@ -1,6 +1,6 @@
-===========================================================================================
-OPNFV Release Note for  the Arno release of OPNFV when using Foreman as a deployment tool
-===========================================================================================
+=============================================================================================
+OPNFV Release Notes for the Arno SR1 release of OPNFV when using Foreman as a deployment tool
+=============================================================================================
 
 
 .. contents:: Table of Contents
@@ -10,12 +10,14 @@ OPNFV Release Note for  the Arno release of OPNFV when using Foreman as a deploy
 Abstract
 ========
 
-This document provides the release notes for Arno release with the Foreman/QuickStack deployment toolchain.
+This document provides the release notes for Arno SR1 release with the Foreman/QuickStack deployment
+toolchain.
 
 License
 =======
 
-All Foreman/QuickStack and "common" entities are protected by the Apache License ( http://www.apache.org/licenses/ )
+All Foreman/QuickStack and "common" entities are protected by the Apache License
+( http://www.apache.org/licenses/ )
 
 
 Version history
@@ -34,18 +36,28 @@ Version history
 | 2015-06-03         | 0.1.2              | Tim Rozet          | Minor Edits        |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
+| 2015-09-10         | 0.2.0              | Tim Rozet          | Updated for SR1    |
+|                    |                    |                    |                    |
++--------------------+--------------------+--------------------+--------------------+
+
 
 Important notes
 ===============
 
-This is the initial OPNFV Arno release that implements the deploy stage of the OPNFV CI pipeline.
+This is the OPNFV Arno SR1 release that implements the deploy stage of the OPNFV CI pipeline.
 
-Carefully follow the installation-instructions which guide a user on how to deploy OPNFV using Foreman/QuickStack installer.
+Carefully follow the installation-instructions which guide a user on how to deploy OPNFV using
+Foreman/QuickStack installer.
 
 Summary
 =======
 
-Arno release with the Foreman/QuickStack deployment toolchain will establish an OPNFV target system on a Pharos compliant lab infrastructure.  The current definition of an OPNFV target system is and OpenStack Juno version combined with OpenDaylight version: Helium.  The system is deployed with OpenStack High Availability (HA) for most OpenStack services.  OpenDaylight is deployed in non-HA form as HA is not availble for Arno release.  Ceph storage is used as Cinder backend, and is the only supported storage for Arno.  Ceph is setup as 3 OSDs and 3 Monitors, one OSD+Mon per Controller node.
+Arno release with the Foreman/QuickStack deployment toolchain will establish an OPNFV target system on
+a Pharos compliant lab infrastructure.  The current definition of an OPNFV target system is and
+OpenStack Juno version combined with OpenDaylight version: Helium.  The system is deployed with
+OpenStack High Availability (HA) for most OpenStack services.  OpenDaylight is deployed in non-HA form
+as HA is not availble for Arno SR1 release.  Ceph storage is used as Cinder backend, and is the only
+supported storage for Arno.  Ceph is setup as 3 OSDs and 3 Monitors, one OSD+Mon per Controller node.
 
 - Documentation is built by Jenkins
 - .iso image is built by Jenkins
@@ -58,16 +70,16 @@ Release Data
 | **Project**                          | genesis                              |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | genesis/arno.2015.1.0                |
+| **Repo/tag**                         | genesis/arno.2015.2.0                |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | arno.2015.1.0                        |
+| **Release designation**              | arno.2015.2.0                        |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | 2015-06-04                           |
+| **Release date**                     | 2015-09-23                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | OPNFV Arno release                   |
+| **Purpose of the delivery**          | OPNFV Arno SR1 release               |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -76,7 +88,8 @@ Version change
 
 Module version changes
 ~~~~~~~~~~~~~~~~~~~~~~
-This is the first tracked version of the Arno release with the Foreman/QuickStack deployment toolchain. It is based on following upstream versions:
+This is the Service Release 1 version of the Arno release with the Foreman/QuickStack deployment
+toolchain. It is based on following upstream versions:
 
 - OpenStack (Juno release)
 
@@ -87,10 +100,11 @@ This is the first tracked version of the Arno release with the Foreman/QuickStac
 Document version changes
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-This is the first tracked version of Arno release with the Foreman/QuickStack deployment toolchain. The following documentation is provided with this release:
+This is the SR1 version of Arno release with the Foreman/QuickStack deployment toolchain. The following
+documentation is provided with this release:
 
-- OPNFV Installation instructions for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 1.0.0
-- OPNFV Release Notes for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 1.0.0 (this document)
+- OPNFV Installation instructions for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 0.2.0
+- OPNFV Release Notes for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 0.2.0 (this document)
 
 Feature additions
 ~~~~~~~~~~~~~~~~~
@@ -99,8 +113,27 @@ Feature additions
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: BGS-4                          | OPNFV base system install            |
-|                                      | using Foreman/Quickstack.            |
+| JIRA: BGS-73                         | Changes Virtual deployments to       |
+|                                      | only require 1 interface, and adds   |
+|                                      | accesbility in China                 |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-75                         | Adds ability to specify number of    |
+|                                      | floating IPs                         |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-3                         | clean now removes all VMs            |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-4                         | Adds ability to specify NICs to      |
+|                                      | bridge to on the jumphost            |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-86                         | Adds ability to specify domain name  |
+|                                      | for deployment                       |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-1                         | Adds ability to specify VM resources |
+|                                      | such as disk size, memory, vcpus     |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-33                        | Adds ability to use single interface |
+|                                      | for baremetal installs               |
 +--------------------------------------+--------------------------------------+
 
 Bug corrections
@@ -112,9 +145,58 @@ Bug corrections
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
+| JIRA: BGS-65                         | Fixes external network bridge and    |
+|                                      | increases neutron quota limits       |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-74                         | Fixes verification of vbox drivers   |
 |                                      |                                      |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-59                         | Adds ODL Deployment stack docs to    |
+|                                      | Foreman Guide                        |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-60                         | Migrates github bgs_vagrant project  |
+|                                      | into Genesis                         |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-89                         | Fixes public allocation IP           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
+| JIRA: BGS-71                         | Adds check to ensure subnets are the |
+|                                      | minimum size required                |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-78                         | Fixes Foreman clean to not hang and  |
+|                                      | now also removes libvirt             |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-7                         | Adds check to make sure 3 control    |
+|                                      | nodes are set when HA is enabled     |
++--------------------------------------+--------------------------------------+
+| JIRA: BGS-68                         | Adds check to make sure baremetal    |
+|                                      | nodes are powered off when deploying |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-14                        | Fixes Vagrant base box to be opnfv   |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-8                         | Fixes puppet modules to come from    |
+|                                      | the Genesis repo                     |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-17                        | Fixes clean to kill vagrant processes|
+|                                      | correctly                            |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-2                         | Removes default vagrant route from   |
+|                                      | virtual nodes                        |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-9                         | Fixes external network to be created |
+|                                      | by the services tenant               |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-10                        | Disables DHCP on external neutron    |
+|                                      | network                              |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-19                        | Adds check to ensure provided arg    |
+|                                      | static_ip_range is correct           |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-12                        | Fixes horizon IP URL for non-HA      |
+|                                      | deployments                          |
++--------------------------------------+--------------------------------------+
+
 
 Deliverables
 ------------
@@ -122,12 +204,12 @@ Deliverables
 Software deliverables
 ~~~~~~~~~~~~~~~~~~~~~
 Foreman/QuickStack@OPNFV .iso file
-deploy.sh - Automatically deploys Target OPNFV System to Bare Metal
+deploy.sh - Automatically deploys Target OPNFV System to Bare Metal or VMs
 
 Documentation deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
-- OPNFV Installation instructions for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 1.0.0
-- OPNFV Release Notes for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 1.0.0 (this document)
+- OPNFV Installation instructions for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 1.2.0
+- OPNFV Release Notes for the Arno release with the Foreman/QuickStack deployment toolchain - ver. 1.2.0 (this document)
 
 Known Limitations, Issues and Workarounds
 =========================================
@@ -153,8 +235,11 @@ Known issues
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: BGS-13                         | bridge br-ex is not auto configured  |
-|                                      | by puppet                            |
+| JIRA: APEX-13                        | Keystone Config: bind host is wrong  |
+|                                      | for admin user                       |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-38                        | Neutron fails to provide DHCP address|
+|                                      | to instance                          |
 +--------------------------------------+--------------------------------------+
 
 Workarounds
@@ -165,7 +250,8 @@ Workarounds
 Test Result
 ===========
 
-The Arno release with the Foreman/QuickStack deployment toolchain has undergone QA test runs with the following results:
+The Arno release with the Foreman/QuickStack deployment toolchain has undergone QA test runs with the
+following results:
 
 +--------------------------------------+--------------------------------------+
 | **TEST-SUITE**                       | **Results:**                         |