additional text/images

f5devcentral · Jul 17, 2017 · 77126ac · 77126ac
1 parent d5307ad
commit 77126ac
Show file tree

Hide file tree

Showing 13 changed files with 76 additions and 33 deletions.
diff --git a/docs/class1/class1.rst b/docs/class1/class1.rst
@@ -1,7 +1,11 @@
 |classname|
 ===========
 
-.. TODO:: Need class description
+During this lab you will learn how to:
+
+* Install the F5 LBaaS Agent using Ansible
+* Deploy Basic L4-L7 services using LBaaS
+* Deploy enhanced L4-L7 services using ESD.
 
 .. toctree::
    :maxdepth: 1

diff --git a/docs/class1/module1/f5-lbaas-overview.png b/docs/class1/module1/f5-lbaas-overview.png
diff --git a/docs/class1/module1/lab1.rst b/docs/class1/module1/lab1.rst
@@ -1,9 +1,15 @@
+.. _verify_openstack:
+
 Login to OpenStack CLI
 ----------------------
 
+
+
 Verify OpenStack environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+The first exercise is to use the OpenStack CLI to verify the environment.
+
 First Launch Putty from the Desktop.
 
     |image1|

diff --git a/docs/class1/module1/lab2.rst b/docs/class1/module1/lab2.rst
@@ -1,6 +1,8 @@
 Deploy Backend Instances
 ------------------------
 
+During the previous excercise we made use of the OpenStack CLI.  OpenStack also has a web gui, Horizon, that can be used.  The following will deploy two backend web servers that will be used later in the lab.
+
 Launch Google Chrome and click on the “Login – OpenStack…” bookmark.
 
     |image5|
@@ -60,7 +62,9 @@ Once the instance status is "active" on “server-1” then “Log” you should
 .. |image5| image:: /_static/image7.png
 .. |image6| image:: /_static/image8.png
 .. |image7| image:: /_static/image9.png
+  :scale: 50%
 .. |image8| image:: /_static/image10.png
+  :scale: 50%
 .. |image9| image:: /_static/image11.png
 .. |image10| image:: /_static/image12.png
 .. |image11| image:: /_static/image13.png
@@ -69,4 +73,5 @@ Once the instance status is "active" on “server-1” then “Log” you should
 .. |image14| image:: /_static/image16.png
 .. |image15| image:: /_static/image17.png
 .. |image16| image:: /_static/image18.png
+  :scale: 50%
 .. |image17| image:: /_static/image19.png
diff --git a/docs/class1/module1/lab3.rst b/docs/class1/module1/lab3.rst
@@ -3,12 +3,12 @@ Install Driver/Agent
 
 Complete directions for installing the Driver/Agent can be found at: http://f5-openstack-lbaasv2-driver.readthedocs.io/en/mitaka/map_quick-start-guide.html
 
-During this lab we will be using Ansible to automate the installation.
+During this lab we will be using Ansible (a Systems/Network automation tool) to automate the installation.  The Ansible module that is being used in this lab can be found at: https://github.com/f5devcentral/f5-openstack-ansible
 
 Install via Ansible
 ~~~~~~~~~~~~~~~~~~~
 
-Open your Putty Window (Directions in Lab 1.1 if you closed the Window).
+Open your Putty Window (Directions in :ref:`verify_openstack` if you closed the Window).
 
 Change your directory by typing ``cd f5-openstack-ansible/playbooks``
 

diff --git a/docs/class1/module1/module1.rst b/docs/class1/module1/module1.rst
@@ -1,7 +1,19 @@
 Installing the F5 LBaaS Agent
 =============================
 
-.. TODO:: Needs module description
+Two pieces of software are required to use F5 BIG-IP with OpenStack LBaaS.
+
+#. F5 LBaaS Driver
+#. F5 OpenStack Agent.
+
+The F5 LBaaS driver communicates with F5 OpenStack Agent that will then use F5 iControl REST to update the BIG-IP configuration.
+
+.. image:: ./f5-lbaas-overview.png
+  :scale: 50% 
+
+The following lab will first guide you through using both the OpenStack GUI/CLI.
+
+You will then install the required software via an Ansible automation script.
 
 .. toctree::
    :maxdepth: 1

diff --git a/docs/class1/module2/lab1.rst b/docs/class1/module2/lab1.rst
@@ -24,7 +24,7 @@ then click on “+Create Load Balancer”.
 
 Complete the following information.
 
-Load Balancer Details
+**Load Balancer Details**
 
 +----------+-------------------+
 | name     | value             |
@@ -33,10 +33,9 @@ Load Balancer Details
 +----------+-------------------+
 | Subnet   | internal-subnet   |
 +----------+-------------------+
-|          |                   |
-+----------+-------------------+
 
-Listener Details
+
+**Listener Details**
 
 +------------+-------------+
 | name       | value       |
@@ -48,7 +47,7 @@ Listener Details
 | Port       | 80          |
 +------------+-------------+
 
-Pool Details
+**Pool Details**
 
 +----------+----------------+
 | name     | value          |
@@ -57,10 +56,8 @@ Pool Details
 +----------+----------------+
 | Method   | ROUND\_ROBIN   |
 +----------+----------------+
-|          |                |
-+----------+----------------+
 
-Pool Members
+**Pool Members**
 
 +------------+--------+
 | name       | port   |
@@ -69,10 +66,8 @@ Pool Members
 +------------+--------+
 | server-2   | 80     |
 +------------+--------+
-|            |        |
-+------------+--------+
 
-Monitor type
+**Monitor type**
 
 +----------------+---------+
 | name           | value   |
@@ -135,8 +130,10 @@ being load balanced.
 +=============+=============+
 +-------------+-------------+
 
-.. |image20| image:: /_static/image22.png
+.. |image20| image:: /_static/image22.png  
+  :scale: 50%
 .. |image21| image:: /_static/image23.png
+  :scale: 50%
 .. |image22| image:: /_static/image24.png
 .. |image23| image:: /_static/image25.png
 .. |image24| image:: /_static/image26.png

diff --git a/docs/class1/module2/lab2.rst b/docs/class1/module2/lab2.rst
@@ -4,17 +4,21 @@ Lab 1.5: Deploy L4-L7 via CLI
 In addition to using the Horizon GUI panel you can also provision LBaaS
 via the command-line. From your Putty window run the following commands:
 
-``neutron lbaas-loadbalancer-create --name lb2 internal-subnet``
+See also :download:`Text file of commands <./neutron-lbaas-cli-cmds.txt>`.
 
-``neutron lbaas-listener-create --name listener2 --loadbalancer lb2 --protocol TCP --protocol-port 22``
+.. code-block:: console
 
-``neutron lbaas-pool-create --name pool2 --lb-algorithm ROUND\_ROBIN --listener listener2 --protocol TCP``
+  neutron lbaas-loadbalancer-create --name lb2 internal-subnet
 
-``neutron lbaas-member-create --subnet internal-subnet --address 10.1.100.101 --protocol-port 22 pool2``
+  neutron lbaas-listener-create --name listener2 --loadbalancer lb2 --protocol TCP --protocol-port 22
 
-``neutron lbaas-member-create --subnet internal-subnet --address 10.1.100.102 --protocol-port 22 pool2``
+  neutron lbaas-pool-create --name pool2 --lb-algorithm ROUND_ROBIN --listener listener2 --protocol TCP
 
-``neutron lbaas-healthmonitor-create --delay 3 --type TCP --max-retries 3 --timeout 3 --pool pool2``
+  neutron lbaas-member-create --subnet internal-subnet --address 10.1.100.101 --protocol-port 22 pool2
+
+  neutron lbaas-member-create --subnet internal-subnet --address 10.1.100.102 --protocol-port 22 pool2
+
+  neutron lbaas-healthmonitor-create --delay 3 --type TCP --max-retries 3 --timeout 3 --pool pool2
 
 Verify on the BIG-IP that you see the new Virtual Server deployed.
 
diff --git a/docs/class1/module2/module2.rst b/docs/class1/module2/module2.rst
@@ -1,10 +1,13 @@
 Deploying Basic L4-L7 Services using LBaaS
 ==========================================
 
-.. TODO:: Needs module description
+There's multiple ways of provisioning F5 Services via OpenStack LBaaS including.
 
-In this module you will learn how to install a |f5| |bip| Applicance into your
-datacenter.
+#. Horizon GUI
+#. CLI
+#. OpenStack API
+
+Today we will be covering the first two options.
 
 .. toctree::
    :maxdepth: 1

diff --git a/docs/class1/module2/neutron-lbaas-cli-cmds.txt b/docs/class1/module2/neutron-lbaas-cli-cmds.txt
@@ -0,0 +1,11 @@
+neutron lbaas-loadbalancer-create --name lb2 internal-subnet
+
+neutron lbaas-listener-create --name listener2 --loadbalancer lb2 --protocol TCP --protocol-port 22
+
+neutron lbaas-pool-create --name pool2 --lb-algorithm ROUND_ROBIN --listener listener2 --protocol TCP
+
+neutron lbaas-member-create --subnet internal-subnet --address 10.1.100.101 --protocol-port 22 pool2
+
+neutron lbaas-member-create --subnet internal-subnet --address 10.1.100.102 --protocol-port 22 pool2
+
+neutron lbaas-healthmonitor-create --delay 3 --type TCP --max-retries 3 --timeout 3 --pool pool2
diff --git a/docs/class1/module3/lab1.rst b/docs/class1/module3/lab1.rst
@@ -13,8 +13,11 @@ Observe that it is using the default TCP profile.
 
 From your Putty window run.
 
-| neutron lbaas-l7policy-create --listener listener1 \\
-| --name esd\_demo\_3 --action REJECT
+.. code-block:: console
+
+  neutron lbaas-l7policy-create --listener listener1 --name esd_demo_3 --action REJECT
+
+You should see the following output.
 
     |image35|
 
@@ -25,7 +28,9 @@ has changed.
 
 Now from your Putty window run.
 
-cat /etc/neutron/services/f5/esd/demo.json
+.. code-block:: console
+
+  cat /etc/neutron/services/f5/esd/demo.json
 
 You will see the definition that we referenced earlier.
 

diff --git a/docs/class1/module3/module3.rst b/docs/class1/module3/module3.rst
@@ -1,10 +1,8 @@
 Deploying Enhanced L4-L7 Services using ESD
 ===========================================
 
-.. TODO:: Needs module description
+LBaaS only provides a subset of the capabilities of an F5 BIG-IP.  The following exercise will demonstrate how to provide a way to extend LBaaS through the use of custom policies.
 
-In this module you will learn how to install a |f5| |bip| Applicance into your
-datacenter.
 
 .. toctree::
    :maxdepth: 1

diff --git a/docs/intro.rst b/docs/intro.rst
@@ -97,8 +97,6 @@ components:
 Connecting to the Lab Environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. TODO:: Complete lab connection instructions
-
 Please follow the instructions provided by the instructor to start your
 lab and access your jump host.