fixes from Greg

f5devcentral · Jul 7, 2017 · 219a5d9 · 219a5d9
1 parent 26d4abf
commit 219a5d9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 32 deletions.
diff --git a/docs/class1/module1/lab1.rst b/docs/class1/module1/lab1.rst
@@ -8,7 +8,7 @@ First Launch Putty from the Desktop.
 
     |image1|
 
-Click on “OpenStack All-In-One” then click “Open”.
+Click on “OpenStack All-In-One”, select load, then click “Open”.
 
     |image2|
 
@@ -17,16 +17,20 @@ should see.
 
     |image3|
 
-Type “. keystonerc\_demo” (period keystonerc\_demo). The prompt should
+Type ``source keystonerc_demo``. The prompt should
 change from:
 
+.. code-block:: console
+
     [student@openstack ~]$
 
 To:
 
-    [student@openstack ~(keystone\_demo)]$
+.. code-block:: console
+
+    [student@openstack ~(keystone_demo)]$
 
-Run “neutron subnet-list” and you should see
+Run ``neutron subnet-list`` and you should see
 
     |image4|
 

diff --git a/docs/class1/module1/lab2.rst b/docs/class1/module1/lab2.rst
@@ -33,7 +33,7 @@ Click on the “+” next to “m1.tiny”. Then click next.
 
     |image12|
 
-Click on the “+” next to “internal” Network. Then click on next TWICE
+Click on the “+” next to “internal” Network. This step should have been completed for you since the internal network is the only network available.  Then click on next TWICE
 until you are on the Security Groups tab.
 
     |image13|
@@ -44,22 +44,18 @@ Then click next.
     |image14|
 
 Click on the “+” next to “demo-key-pair” and the click on “Launch
-Instance”.
+Instance”.  This step should have been completed for you since the demo-key-pair is the only available key pair.
 
     |image15|
 
 You should now see them starting.
 
     |image16|
 
-Clicking on “server-1” then “Log” you should see
+Once the instance status is "active" on “server-1” then “Log” you should see
 
     |image17|
 
-In this lab environment OpenStack is running in a nested environment.
-This will cause the
-
-.. TODO:: sentence above is incomplete
 
 .. |image5| image:: /_static/image7.png
 .. |image6| image:: /_static/image8.png

diff --git a/docs/class1/module1/lab3.rst b/docs/class1/module1/lab3.rst
@@ -1,30 +1,33 @@
 Install Driver/Agent
 --------------------
 
-Review online documentation
+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.
 
 Install via Ansible
+~~~~~~~~~~~~~~~~~~~
 
 Open your Putty Window (Directions in Lab 1.1 if you closed the Window).
 
 Change your directory by typing ``cd f5-openstack-ansible/playbooks``
 
 .. code-block:: console
 
-[student@openstack ~]$cd f5-openstack-ansible/playbooks/
+  [student@openstack ~]$cd f5-openstack-ansible/playbooks/
 
-Now run ``ansible-playbook -i hosts --extra-vars '{"remote\_user":"student"}' agent\_driver\_deploy.yaml``
+Now run ``ansible-playbook -i hosts --extra-vars '{"remote_user":"student"}' agent_driver_deploy.yaml``
 
 |image18|
 
 Change back to your home directory by typing ``cd``.
 
-Now type ``. keystonerc\_admin`` and you should see a prompt that looks
+Now type ``source keystonerc_admin`` and you should see a prompt that looks
 like:
 
 .. code-block:: console
 
-    [student@openstack ~(keystone\_admin)]$
+    [student@openstack ~(keystone_admin)]$
 
 Expand the window to full screen and type. ``neutron agent-list``
 

diff --git a/docs/class1/module2/lab1.rst b/docs/class1/module2/lab1.rst
@@ -10,7 +10,7 @@ Also note only one self-ip in Route Domain 0.
 
     |image20|
 
-From Chrome do a forced refresh of the Horizon page (Shift+[Reload]).
+Switch back to the OpenStack Horizon tab inside Chrome and do a forced refresh (Shift+[Reload]).
 
 You should now see a new menu item under “Network”.
 
@@ -90,8 +90,8 @@ partition was created.
     |image24|
 
 Change to that partition and inspect the Self IPs items under Network.
-You should see a VXLAN tunnel that was created to connect to the tenant
-network.
+You should see that a VXLAN tunnel that was created connected to the tenant network.  Verify the tenant network is the internal network from viewing the ``neutron subnet-list`` command you ran in the previous lab.
+
 
     |image25|
 
@@ -100,8 +100,9 @@ via the Horizon Panel.
 
     |image26|
 
-Observe that the Pool name uses the OpenStack Pool ID (yours will differ
-in value from the example).
+Observe that the BIG-IP Pool name uses the OpenStack Pool ID from the load balancer configuration.  Horizon>Network>Load Balancers>lb1>Listeners>Listener 1 – Default Pool ID 
+
+(yours will differ in value from the example).
 
     |image27|
 

diff --git a/docs/intro.rst b/docs/intro.rst
@@ -1,13 +1,11 @@
 Getting Started
 ---------------
 
-During this lab you will learn about deploying BIG-IP outside of an
-OpenStack install using an undercloud deployment with LBaaS. You will
-learn about:
+During this lab you will learn how to:
 
-- Installing the F5 LBaaS Agent
-- Deploying Basic L4-L7 services using LBaaS
-- Deploying enhanced L4-L7 services using ESD.
+- Install the F5 LBaaS Agent
+- Deploy Basic L4-L7 services using LBaaS
+- Deploy enhanced L4-L7 services using ESD.
 
 About OpenStack
 ~~~~~~~~~~~~~~~
@@ -47,17 +45,17 @@ OpenStack Nova. In this scenario the BIG-IP is in a similar topology to
 other tenant virtual machines. When deploying in overcloud OpenStack
 HEAT templates (automation templates) are commonly used to deploy the
 BIG-IP device. A customer can manage the BIG-IP device through
-traditional, HEAT templates, and/or other automation templates.
+traditional methods, HEAT templates, and/or other automation templates.
 
 It is also possible to deploy a BIG-IP VE in an overcloud deployment and
-use LBaaS. In this deployment you are currently limited by the number of
-interfaces that the BIG-IP can use (10).
+use LBaaS. In this deployment you are limited by the number of
+interfaces currently supported on BIG-IP VE can use (9 data & 1 mgmt).
 
 Under or Over?
 ~~~~~~~~~~~~~~
 
 The decision to use one method or both will depend on customer
-requirements. An undercloud deployment using LBaaS is well suite to
+requirements. An undercloud deployment using LBaaS is well suited to
 providing basic services that can be provided in a multi-tenant manner.
 Overcloud is well suited to providing access to features and functions
 that may not be exposed via LBaaS or provide per-tenant services.
@@ -69,7 +67,7 @@ The current Lab Environment looks like the following:
 
 |image0|
 
-You will be connecting via RDP to the Windows host to perform all the
+You will be connecting via RDP to a Windows host to perform all the
 steps in this lab.
 
 Lab Components