Repo/doc cleanup; refactor so additional classes can be added

f5devcentral · Jul 21, 2017 · d34960e · d34960e
1 parent 9fd5d28
commit d34960e
Show file tree

Hide file tree

Showing 54 changed files with 135 additions and 146 deletions.
diff --git a/docs/class1/module1/f5-lbaas-overview.png → docs/_static/class1/f5-lbaas-overview.png b/docs/class1/module1/f5-lbaas-overview.png → docs/_static/class1/f5-lbaas-overview.png
diff --git a/docs/_static/image1.jpg → docs/_static/class1/image1.jpg b/docs/_static/image1.jpg → docs/_static/class1/image1.jpg
diff --git a/docs/_static/image10.png → docs/_static/class1/image10.png b/docs/_static/image10.png → docs/_static/class1/image10.png
diff --git a/docs/_static/image11.png → docs/_static/class1/image11.png b/docs/_static/image11.png → docs/_static/class1/image11.png
diff --git a/docs/_static/image12.png → docs/_static/class1/image12.png b/docs/_static/image12.png → docs/_static/class1/image12.png
diff --git a/docs/_static/image13.png → docs/_static/class1/image13.png b/docs/_static/image13.png → docs/_static/class1/image13.png
diff --git a/docs/_static/image14.png → docs/_static/class1/image14.png b/docs/_static/image14.png → docs/_static/class1/image14.png
diff --git a/docs/_static/image15.png → docs/_static/class1/image15.png b/docs/_static/image15.png → docs/_static/class1/image15.png
diff --git a/docs/_static/image16.png → docs/_static/class1/image16.png b/docs/_static/image16.png → docs/_static/class1/image16.png
diff --git a/docs/_static/image17.png → docs/_static/class1/image17.png b/docs/_static/image17.png → docs/_static/class1/image17.png
diff --git a/docs/_static/image18.png → docs/_static/class1/image18.png b/docs/_static/image18.png → docs/_static/class1/image18.png
diff --git a/docs/_static/image19.png → docs/_static/class1/image19.png b/docs/_static/image19.png → docs/_static/class1/image19.png
diff --git a/docs/_static/image2.png → docs/_static/class1/image2.png b/docs/_static/image2.png → docs/_static/class1/image2.png
diff --git a/docs/_static/image20.png → docs/_static/class1/image20.png b/docs/_static/image20.png → docs/_static/class1/image20.png
diff --git a/docs/_static/image21.png → docs/_static/class1/image21.png b/docs/_static/image21.png → docs/_static/class1/image21.png
diff --git a/docs/_static/image22.png → docs/_static/class1/image22.png b/docs/_static/image22.png → docs/_static/class1/image22.png
diff --git a/docs/_static/image23.png → docs/_static/class1/image23.png b/docs/_static/image23.png → docs/_static/class1/image23.png
diff --git a/docs/_static/image24.png → docs/_static/class1/image24.png b/docs/_static/image24.png → docs/_static/class1/image24.png
diff --git a/docs/_static/image25.png → docs/_static/class1/image25.png b/docs/_static/image25.png → docs/_static/class1/image25.png
diff --git a/docs/_static/image26.png → docs/_static/class1/image26.png b/docs/_static/image26.png → docs/_static/class1/image26.png
diff --git a/docs/_static/image27.png → docs/_static/class1/image27.png b/docs/_static/image27.png → docs/_static/class1/image27.png
diff --git a/docs/_static/image28.png → docs/_static/class1/image28.png b/docs/_static/image28.png → docs/_static/class1/image28.png
diff --git a/docs/_static/image29.png → docs/_static/class1/image29.png b/docs/_static/image29.png → docs/_static/class1/image29.png
diff --git a/docs/_static/image3.png → docs/_static/class1/image3.png b/docs/_static/image3.png → docs/_static/class1/image3.png
diff --git a/docs/_static/image30.png → docs/_static/class1/image30.png b/docs/_static/image30.png → docs/_static/class1/image30.png
diff --git a/docs/_static/image31.png → docs/_static/class1/image31.png b/docs/_static/image31.png → docs/_static/class1/image31.png
diff --git a/docs/_static/image32.png → docs/_static/class1/image32.png b/docs/_static/image32.png → docs/_static/class1/image32.png
diff --git a/docs/_static/image33.png → docs/_static/class1/image33.png b/docs/_static/image33.png → docs/_static/class1/image33.png
diff --git a/docs/_static/image34.png → docs/_static/class1/image34.png b/docs/_static/image34.png → docs/_static/class1/image34.png
diff --git a/docs/_static/image35.png → docs/_static/class1/image35.png b/docs/_static/image35.png → docs/_static/class1/image35.png
diff --git a/docs/_static/image36.png → docs/_static/class1/image36.png b/docs/_static/image36.png → docs/_static/class1/image36.png
diff --git a/docs/_static/image37.png → docs/_static/class1/image37.png b/docs/_static/image37.png → docs/_static/class1/image37.png
diff --git a/docs/_static/image38.png → docs/_static/class1/image38.png b/docs/_static/image38.png → docs/_static/class1/image38.png
diff --git a/docs/_static/image39.png → docs/_static/class1/image39.png b/docs/_static/image39.png → docs/_static/class1/image39.png
diff --git a/docs/_static/image4.png → docs/_static/class1/image4.png b/docs/_static/image4.png → docs/_static/class1/image4.png
diff --git a/docs/_static/image40.png → docs/_static/class1/image40.png b/docs/_static/image40.png → docs/_static/class1/image40.png
diff --git a/docs/_static/image5.png → docs/_static/class1/image5.png b/docs/_static/image5.png → docs/_static/class1/image5.png
diff --git a/docs/_static/image6.png → docs/_static/class1/image6.png b/docs/_static/image6.png → docs/_static/class1/image6.png
diff --git a/docs/_static/image7.png → docs/_static/class1/image7.png b/docs/_static/image7.png → docs/_static/class1/image7.png
diff --git a/docs/_static/image8.png → docs/_static/class1/image8.png b/docs/_static/image8.png → docs/_static/class1/image8.png
diff --git a/docs/_static/image9.png → docs/_static/class1/image9.png b/docs/_static/image9.png → docs/_static/class1/image9.png
diff --git a/docs/_static/image001.png b/docs/_static/image001.png
diff --git a/docs/_static/image002.png b/docs/_static/image002.png
diff --git a/docs/class1/class1.rst b/docs/class1/class1.rst
@@ -1,14 +1,10 @@
-|classname|
-===========
-
-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.
+Class 1: |classname| for Openstack
+==================================
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
-   module*/module*
+   gettingstarted
+   labinfo
+   module*/module*
diff --git a/docs/intro.rst → docs/class1/gettingstarted.rst b/docs/intro.rst → docs/class1/gettingstarted.rst
@@ -3,9 +3,9 @@ Getting Started
 
 During this lab you will learn how to:
 
-- Install the F5 LBaaS Agent
-- Deploy Basic L4-L7 services using LBaaS
-- Deploy enhanced L4-L7 services using ESD.
+* Install the F5 LBaaS Agent using Ansible
+* Deploy Basic L4-L7 services using LBaaS
+* Deploy enhanced L4-L7 services using ESD.
 
 About OpenStack
 ~~~~~~~~~~~~~~~
@@ -59,53 +59,3 @@ 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.
-
-Lab Topology
-~~~~~~~~~~~~
-
-The current Lab Environment looks like the following:
-
-|image0|
-
-You will be connecting via RDP to a Windows host to perform all the
-steps in this lab.
-
-Lab Components
-^^^^^^^^^^^^^^
-
-The following table lists VLANS, IP Addresses and Credentials for all
-components:
-
-.. list-table::
-    :widths: 20 40 40
-    :header-rows: 1
-    :stub-columns: 1
-
-    * - **Component**
-      - **VLAN/IP Address(es)**
-      - **Credentials**
-    * - Windows RDP Host
-      - - 10.0.10.50
-      - ``student``/[Viewable in Ravello]
-    * - OpenStack
-      - - 10.0.10.10
-      - ``student`` / [SSH Key]
-    * - BIG-IP
-      - - 10.0.10.20
-      - ``admin`` / ``admin``
-
-Connecting to the Lab Environment
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Please follow the instructions provided by the instructor to start your
-lab and access your jump host.
-
-.. NOTE::
-   All work for this lab will be performed exclusively from the Windows
-   jumphost. No installation or interaction with your local system is
-   required.
-
-.. |image0| image:: /_static/image2.png
-  :scale: 50%
-
-
diff --git a/docs/class1/labinfo.rst b/docs/class1/labinfo.rst
@@ -0,0 +1,46 @@
+Lab Topology
+============
+
+The current Lab Environment looks like the following:
+
+|image0|
+
+You will be connecting via RDP to a Windows host to perform all the
+steps in this lab.
+
+Lab Components
+--------------
+
+The following table lists VLANS, IP Addresses and Credentials for all
+components:
+
+.. list-table::
+    :widths: 20 40 40
+    :header-rows: 1
+    :stub-columns: 1
+
+    * - **Component**
+      - **VLAN/IP Address(es)**
+      - **Credentials**
+    * - Windows RDP Host
+      - - 10.0.10.50
+      - ``student``/[Viewable in Ravello]
+    * - OpenStack
+      - - 10.0.10.10
+      - ``student`` / [SSH Key]
+    * - BIG-IP
+      - - 10.0.10.20
+      - ``admin`` / ``admin``
+
+Connecting to the Lab Environment
+---------------------------------
+
+Please follow the instructions provided by the instructor to start your
+lab and access your jump host.
+
+.. NOTE:: All work for this lab will be performed exclusively from the Windows
+   jumphost. No installation or interaction with your local system is
+   required.
+
+.. |image0| image:: /_static/class1/image2.png
+   :scale: 50%
diff --git a/docs/class1/module1/lab1.rst b/docs/class1/module1/lab1.rst
@@ -3,8 +3,6 @@
 Login to OpenStack CLI
 ----------------------
 
-
-
 Verify OpenStack environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -42,11 +40,11 @@ Run ``neutron subnet-list`` and you should see
 Please ask for assistance if you do not see the correct output. Leave
 this window open, it will be used throughout the lab.
 
-.. |image1| image:: /_static/image3.png
-  :scale: 50%
-.. |image2| image:: /_static/image4.png
-  :scale: 50%
-.. |image3| image:: /_static/image5.png
-  :scale: 50%
-.. |image4| image:: /_static/image6.png
-  :scale: 50%
+.. |image1| image:: /_static/class1/image3.png
+   :scale: 50%
+.. |image2| image:: /_static/class1/image4.png
+   :scale: 50%
+.. |image3| image:: /_static/class1/image5.png
+   :scale: 50%
+.. |image4| image:: /_static/class1/image6.png
+   :scale: 50%
diff --git a/docs/class1/module1/lab2.rst b/docs/class1/module1/lab2.rst
@@ -61,29 +61,29 @@ Once the instance status is "active" on “server-1” then “Log” you should
 |image17|
 
 
-.. |image5| image:: /_static/image7.png
-  :scale: 25%
-.. |image6| image:: /_static/image8.png
-  :scale: 50%
-.. |image7| image:: /_static/image9.png
-  :scale: 50%
-.. |image8| image:: /_static/image10.png
-  :scale: 50%
-.. |image9| image:: /_static/image11.png
-  :scale: 50%
-.. |image10| image:: /_static/image12.png
-  :scale: 50%
-.. |image11| image:: /_static/image13.png
-  :scale: 50%
-.. |image12| image:: /_static/image14.png
-  :scale: 50%
-.. |image13| image:: /_static/image15.png
-  :scale: 50%
-.. |image14| image:: /_static/image16.png
-  :scale: 50%
-.. |image15| image:: /_static/image17.png
-  :scale: 50%
-.. |image16| image:: /_static/image18.png
-  :scale: 50%
-.. |image17| image:: /_static/image19.png
-  :scale: 50%
+.. |image5| image:: /_static/class1/image7.png
+   :scale: 25%
+.. |image6| image:: /_static/class1/image8.png
+   :scale: 50%
+.. |image7| image:: /_static/class1/image9.png
+   :scale: 50%
+.. |image8| image:: /_static/class1/image10.png
+   :scale: 50%
+.. |image9| image:: /_static/class1/image11.png
+   :scale: 50%
+.. |image10| image:: /_static/class1/image12.png
+   :scale: 50%
+.. |image11| image:: /_static/class1/image13.png
+   :scale: 50%
+.. |image12| image:: /_static/class1/image14.png
+   :scale: 50%
+.. |image13| image:: /_static/class1/image15.png
+   :scale: 50%
+.. |image14| image:: /_static/class1/image16.png
+   :scale: 50%
+.. |image15| image:: /_static/class1/image17.png
+   :scale: 50%
+.. |image16| image:: /_static/class1/image18.png
+   :scale: 50%
+.. |image17| image:: /_static/class1/image19.png
+   :scale: 50%
diff --git a/docs/class1/module1/lab3.rst b/docs/class1/module1/lab3.rst
@@ -54,7 +54,7 @@ Now type ``source keystonerc_demo`` to restore your prompt to the demo user.
     [student@openstack ~(keystone_demo)]$
 
 
-.. |image18| image:: /_static/image20.png
-  :scale: 50%
-.. |image19| image:: /_static/image21.png
-  :scale: 50%
+.. |image18| image:: /_static/class1/image20.png
+   :scale: 50%
+.. |image19| image:: /_static/class1/image21.png
+   :scale: 50%
diff --git a/docs/class1/module1/module1.rst b/docs/class1/module1/module1.rst
@@ -8,8 +8,8 @@ Two pieces of software are required to use F5 BIG-IP with OpenStack LBaaS.
 
 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% 
+.. image:: /_static/class1/f5-lbaas-overview.png
+   :scale: 50% 
 
 The following lab will first guide you through using both the OpenStack GUI/CLI.
 

diff --git a/docs/class1/module2/lab1.rst b/docs/class1/module2/lab1.rst
@@ -128,31 +128,31 @@ being load balanced.
 | |image32|   | |image33|   |
 +-------------+-------------+
 
-.. |image20| image:: /_static/image22.png
-  :scale: 50%
-.. |image21| image:: /_static/image23.png
-  :scale: 50%
-.. |image22| image:: /_static/image24.png
-  :scale: 50%
-.. |image23| image:: /_static/image25.png
-  :scale: 50%
-.. |image24| image:: /_static/image26.png
-  :scale: 50%
-.. |image25| image:: /_static/image27.png
-  :scale: 50%
-.. |image26| image:: /_static/image28.png
-  :scale: 50%
-.. |image27| image:: /_static/image29.png
-  :scale: 50%
-.. |image28| image:: /_static/image30.png
-  :scale: 50%
-.. |image29| image:: /_static/image31.png
-  :scale: 50%
-.. |image30| image:: /_static/image32.png
-  :scale: 50%
-.. |image31| image:: /_static/image33.png
-  :scale: 50%
-.. |image32| image:: /_static/image34.png
-  :scale: 50%
-.. |image33| image:: /_static/image35.png
-  :scale: 50%
+.. |image20| image:: /_static/class1/image22.png
+   :scale: 50%
+.. |image21| image:: /_static/class1/image23.png
+   :scale: 50%
+.. |image22| image:: /_static/class1/image24.png
+   :scale: 50%
+.. |image23| image:: /_static/class1/image25.png
+   :scale: 50%
+.. |image24| image:: /_static/class1/image26.png
+   :scale: 50%
+.. |image25| image:: /_static/class1/image27.png
+   :scale: 50%
+.. |image26| image:: /_static/class1/image28.png
+   :scale: 50%
+.. |image27| image:: /_static/class1/image29.png
+   :scale: 50%
+.. |image28| image:: /_static/class1/image30.png
+   :scale: 50%
+.. |image29| image:: /_static/class1/image31.png
+   :scale: 50%
+.. |image30| image:: /_static/class1/image32.png
+   :scale: 50%
+.. |image31| image:: /_static/class1/image33.png
+   :scale: 50%
+.. |image32| image:: /_static/class1/image34.png
+   :scale: 50%
+.. |image33| image:: /_static/class1/image35.png
+   :scale: 50%
diff --git a/docs/class1/module3/lab1.rst b/docs/class1/module3/lab1.rst
@@ -39,11 +39,11 @@ You will see the definition that we referenced earlier.
 In addition to TCP profiles you can also add iRules, Local Traffic
 Policies, client/server SSL profiles, and modify session persistence.
 
-.. |image34| image:: /_static/image36.png
-  :scale: 50%
-.. |image35| image:: /_static/image37.png
-  :scale: 50%
-.. |image36| image:: /_static/image38.png
-  :scale: 50%
-.. |image37| image:: /_static/image39.png
-  :scale: 50%
+.. |image34| image:: /_static/class1/image36.png
+   :scale: 50%
+.. |image35| image:: /_static/class1/image37.png
+   :scale: 50%
+.. |image36| image:: /_static/class1/image38.png
+   :scale: 50%
+.. |image37| image:: /_static/class1/image39.png
+   :scale: 50%
diff --git a/docs/conf.py b/docs/conf.py
@@ -5,10 +5,10 @@
 # ------------
 #
 # REQUIRED: Your class/lab name
-classname = "F5 Private Cloud Solutions - OpenStack"
+classname = "F5 Private Cloud Solutions"
 
 # OPTIONAL: The URL to the GitHub Repository for this class
-github_repo = "https://github.com/f5devcentral/f5-agility-labs-openstack"
+github_repo = "https://github.com/f5devcentral/f5-agility-labs-private-cloud"
 
 # OPTIONAL: Google Analytics
 # googleanalytics_id = 'UA-85156643-4'

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,10 +1,10 @@
-F5 Agility Labs - Index
-=======================
+|classname|
+===========
 
 Welcome
 -------
 
-Welcome to the |classbold| lab at F5 Agility |year|
+Welcome to the |classbold| labs at F5 Agility |year|
 
 |repoinfo|
 
@@ -14,5 +14,4 @@ Welcome to the |classbold| lab at F5 Agility |year|
    :caption: Contents:
    :glob:
 
-   intro*
    class*/class*