Edits to class 2 and addition of the Reveal Presentation

Moved the SNOPS container away from develop on the Jenkins variant,
also added Chris’s reveal presentation for Class 1. Lots of other
spelling an spacing issues

Author: jmcalalang

docs/class2/class2.rst

@@ -3,14 +3,16 @@ Class 2: Building Continuous Delivery Pipelines
 
 This class covers the following topics:
 
-- Continuous Integration (CI)/Continuous Delivery (CD) Concepts
-- F5 Automation Tools:
+- Continuous Integration(CI) and Continuous Delivery(CD) Concepts
 
-  - The f5-super-netops-container
-  - Collections and the f5-postman-workflows extension to Postman
-  - Automation Workflows using f5-newman-wrapper
+- F5 Automation Toolkits:
+
+  - F5-Super-NetOps-Container
+  - F5 Postman Collections and f5-postman-workflows extensions
+  - F5 f5-newman-wrapper for Automating Workflows
 
 - Building CI/CD Pipelines with Jenkins
+- Team Collaboration with Automated Slack Notifications
 
 Expected time to complete: **3 hours**
 

docs/class2/module1/lab1.rst

@@ -23,13 +23,13 @@ Task 1 – Install Docker CE
 Please follow the instructions at https://docs.docker.com/engine/installation/
 to install Docker CE.
 
-Once you have completely installed and successfully run the ``hello-world``
+Once you have completely installed, and successfully run the ``hello-world``
 test you can continue to the next lab.
 
 To test your setup with the ``hello-world`` container, you just need to run the
 following command
 
-``docker run hello-world``
+``docker run --rm hello-world``
 
 Example output:
 
@@ -63,9 +63,9 @@ Example output:
 .. NOTE:: The ``--rm`` option will delete the container as soon as it stops
    running.
 
-   If you see this message: *Cannot connect to the Docker daemon. Is the docker
-   daemon running on this host?* , it is likely that you don't have enough
-   privileges with your user, try to use sudo when executing docker commands.
+   If you see this message: **Cannot connect to the Docker daemon. Is the docker
+   daemon running on this host?**, it is likely that you don't have enough
+   privileges with your user, try to use **sudo** when executing docker commands.
 
    If you want to remove the hello-world container, you can run the command
    ``sudo docker rmi hello-world``

docs/class2/module1/lab2.rst

@@ -11,7 +11,7 @@ Lab |labmodule|\.\ |labnum|\: Obtain & Start the f5-super-netops-container Image
 In this lab we will use the ``docker`` cli tools to obtain and start the
 f5-super-netops-container image.
 
-Task 1 – Obtain the container image
+Task 1 – Obtain and verfiy the container image
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Perform the following steps to complete this task:
@@ -21,14 +21,14 @@ Perform the following steps to complete this task:
 .. NOTE:: If you are using an F5 provided lab environment please SSH to the
       'Docker Server' host and execute the following commands.
 
-#. Execute ``docker pull f5devcentral/f5-super-netops-container:develop-jenkins``
+#. Execute ``docker pull f5devcentral/f5-super-netops-container:jenkins``
 
    Example output:
 
    .. code::
 
-      $ docker pull f5devcentral/f5-super-netops-container:develop-jenkins
-      develop-jenkins: Pulling from f5devcentral/f5-super-netops-container
+      $ docker pull f5devcentral/f5-super-netops-container:jenkins
+      jenkins: Pulling from f5devcentral/f5-super-netops-container
       019300c8a437: Pull complete
       2d6b38b56ae7: Pull complete
       5fab9174d5b4: Pull complete
@@ -56,7 +56,7 @@ Perform the following steps to complete this task:
       5bcd8c5223bb: Pull complete
       b0defdb83b82: Pull complete
       Digest: sha256:27563f98bf58c9d26eb5989acaf540a9ad7fb1806e4a4c373ad28769ebe63ef4
-      Status: Downloaded newer image for f5devcentral/f5-super-netops-container:develop-jenkins
+      Status: Downloaded newer image for f5devcentral/f5-super-netops-container:jenkins
 
 #. Execute ``docker images``
 
@@ -66,20 +66,20 @@ Perform the following steps to complete this task:
 
       $ docker images
       REPOSITORY                               TAG                 IMAGE ID            CREATED             SIZE
-      f5devcentral/f5-super-netops-container   develop-jenkins     b71fc40407e4        2 weeks ago         490MB
+      f5devcentral/f5-super-netops-container   jenkins             b71fc40407e4        2 weeks ago         490MB
 
 Task 2 – Start the container image
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To start using the container we will execute the command:
 
-#. Execute ``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=develop f5devcentral/f5-super-netops-container:develop-jenkins``
+#. Execute ``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=master f5devcentral/f5-super-netops-container:jenkins``
 
 .. NOTE:: The image requires Internet connectivity to download the latest versions of tools and documentation.  Please ensure you have proper connectivity from your host prior to starting the image.  If you need to use a proxy please refer to the documentation at https://docs.docker.com
 
    The image will now start and load resources from the Internet.  This process
    may take a while depending on the speed of your connection.  When the startup
-   process is complete you will be presented with a ``root`` user prompt.  You
+   process is complete you will be presented in the ``root`` user prompt.  You
    can interact with the image with standard Linux commands.  In the next lab
    we will connect to the image via SSH and HTTP.
 
@@ -89,16 +89,16 @@ To start using the container we will execute the command:
 
    The ``-it`` option will make the session interactive and allocate a pseudo-TTY
 
-   The ``-e`` option will specify a Github Branch, in this case we are pulling from ``develop``
+   The ``-e`` option will specify a Github Branch, in this case we are pulling from ``master``
 
-   The ``f5devcentral/f5-super-netops-container:develop-jenkins`` option is the name
+   The ``f5devcentral/f5-super-netops-container:jenkins`` option is the name
    associated with the image we obtained in Task 1.
 
    Example startup output:
 
    .. code::
 
-      container:develop-jenkins
+      container:jenkins
       [s6-init] making user provided files available at /var/run/s6/etc...exited 0.
       [s6-init] ensuring user provided files have correct perms...exited 0.
       [fix-attrs.d] applying ownership & permissions fixes...
@@ -116,7 +116,7 @@ To start using the container we will execute the command:
       [environment] SNOPS_REVEALJS_DEV=0
       [environment] SNOPS_HOST_HTTP=8080
       [environment] SNOPS_IMAGE=jenkins
-      [environment] SNOPS_GH_BRANCH=develop
+      [environment] SNOPS_GH_BRANCH=master
       Reticulating splines...
       Becoming self-aware...
       [cloneGitRepos] Retrieving repository list from https://github.com/f5devcentral/f5-super-netops-container.git#develop
@@ -201,10 +201,14 @@ avoid this you should detach from the container once it has completed booting.
 You can still perform functions by using SSH to access the container as
 explained in the next lab.
 
+Its likely that the installation of the f5-super-netops-container will not be
+on a localhost while running in a large environment, the steps below show how
+you can leave this instance running as a background process, if needed.
+
 Detach the Container
 ^^^^^^^^^^^^^^^^^^^^
 
-#. Enter ``Ctrl+p+q`` in the running TTY.
+#. Issue a ``Ctrl+p+q`` in the running TTY.
 
    Example output:
 
@@ -224,7 +228,7 @@ Detach the Container
       hostname:~ user$ docker ps
       $ docker ps
       CONTAINER ID        IMAGE                                                    COMMAND                  CREATED             STATUS              PORTS                                                                                      NAMES
-      4cf75944bfbc        f5devcentral/f5-super-netops-container:develop-jenkins   "/init /snopsboot/..."   2 minutes ago       Up 2 minutes        8000/tcp, 50000/tcp, 0.0.0.0:2222->22/tcp, 0.0.0.0:8080->80/tcp, 0.0.0.0:10000->8080/tcp   loving_montalcini
+      4cf75944bfbc        f5devcentral/f5-super-netops-container:jenkins           "/init /snopsboot/..."   2 minutes ago       Up 2 minutes        8000/tcp, 50000/tcp, 0.0.0.0:2222->22/tcp, 0.0.0.0:8080->80/tcp, 0.0.0.0:10000->8080/tcp   loving_montalcini
 
 Re-attach the Container
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -238,12 +242,12 @@ Re-attach the Container
        hostname:~ user$ docker ps
        $ docker ps
        CONTAINER ID        IMAGE                                                    COMMAND                  CREATED             STATUS              PORTS                                                                                      NAMES
-       4cf75944bfbc        f5devcentral/f5-super-netops-container:develop-jenkins   "/init /snopsboot/..."   2 minutes ago       Up 2 minutes        8000/tcp, 50000/tcp, 0.0.0.0:2222->22/tcp, 0.0.0.0:8080->80/tcp, 0.0.0.0:10000->8080/tcp   loving_montalcini
+       4cf75944bfbc        f5devcentral/f5-super-netops-container:jenkins           "/init /snopsboot/..."   2 minutes ago       Up 2 minutes        8000/tcp, 50000/tcp, 0.0.0.0:2222->22/tcp, 0.0.0.0:8080->80/tcp, 0.0.0.0:10000->8080/tcp   loving_montalcini
       |------------|
         ^- YOUR CONTAINER ID
 
 #. Copy the value under the ``CONTAINER ID`` column that correspond to the
-   f5devcentral/f5-super-netops-container:develop-jenkins image.
+   f5devcentral/f5-super-netops-container:jenkins image.
 #. Execute ``docker attach <container_id>``
-#. You may have to hit ``<Enter>`` to display the command prompt
+#. You may have to hit ``<Enter>`` twice to display the command prompt
 #. Detach the container again by entering ``<Ctrl+p+q>``

docs/class2/module1/lab3.rst

@@ -9,19 +9,19 @@ Lab |labmodule|\.\ |labnum|\: Connect to f5-super-netops-container
 ------------------------------------------------------------------
 
 In the previous lab we started the container image and were presented with a
-root command prompt.  In order to use the container and its associated
-tools properly you connect via SSH and/or HTTP.
+root user terminal.  In order to use the container and its associated
+tools properly we will connect via SSH and/or HTTP.
 
 .. _lab1_3_1:
 
 Task 1 – Connect via SSH
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 To connect to the image via SSH we must use the published port specified in the
-``docker run`` command.  To review the command used to start the container was:
+``docker run`` command.  **To review** the command used to start the container was:
 
-``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=develop
-f5devcentral/f5-super-netops-container:develop-jenkins``
+``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=master
+f5devcentral/f5-super-netops-container:jenkins``
 
 This will publish the standard SSH service on ``TCP/22`` to ``TCP/2222`` on the
 Docker host.  In the case of the SSH service the following mapping applies:
@@ -31,14 +31,14 @@ Docker host.  In the case of the SSH service the following mapping applies:
 .. NOTE:: If you are using an F5 provided lab environment please use the SSH
    client and connect to the 'f5-super-netops-container SSH' item
 
-Additionally the container includes the ``snops`` user with a password of
-``default``.  To connect to the container execute the following command
-or it's OS-specific equivalent:
+The container includes the ``snops`` user with a password of
+``default``.  If you are not using the F5 Lab environment connect to the container
+execute the following command or it's OS-specific equivalent:
 
 ``ssh -p 2222 snops@localhost``
 
-.. NOTE:: The host SSH keys are regenerated each time the container boots.  As
-   a result you may receive an error when trying to connect indicating the host
+.. NOTE:: The host SSH keys for our environment are regenerated each time the container boots,
+   you may receive an error when trying to connect indicating the host
    key has changed.  This error is safe to ignore in this case and can be
    resolved by removing the key from ``~/.ssh/known_hosts``.  You can also
    configure your local SSH config by adding the following to ``~/.ssh/config``:
@@ -50,7 +50,7 @@ or it's OS-specific equivalent:
        StrictHostKeyChecking no
        UserKnownHostsFile /dev/null
 
-Example output:
+Example output of connecting to the container:
 
 .. code::
 
@@ -109,11 +109,11 @@ Example output:
 Task 2 – Connect via HTTP
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To connect to the image via HTTP we must use the published port specified in the
-``docker run`` command.  To review the command used to start the container was:
+To connect to the image via HTTP we use the published port specified in the
+``docker run`` command.  **To review** the command used to start the container was:
 
-``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=develop
-f5devcentral/f5-super-netops-container:develop-jenkins``
+``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=master
+f5devcentral/f5-super-netops-container:jenkins``
 
 This will publish the standard HTTP service on ``TCP/80`` to ``TCP/8080`` on the
 Docker host.  In the case of the HTTP service the following mapping applies:
@@ -123,9 +123,9 @@ Docker host.  In the case of the HTTP service the following mapping applies:
 .. NOTE:: If you are using an F5 provided lab environment please use the browser
    and click the 'Super Netops Container' bookmark.
 
-To connect via HTTP open a web browser and enter the URL:
+To connect outside of the F5 Lab environment via HTTP, open a web browser and enter the URL:
 
-``http://10.1.1.8:8080/start``
+``http://(YourDockerSever):8080/start``
 
 You should see a page like this:
 
@@ -134,23 +134,22 @@ You should see a page like this:
 Task 3 – Connect via Jenkins
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To connect to the image via Jenkins we must use the published port specified in the
-``docker run`` command.  To review the command used to start the container was:
+To connect to the image via Jenkins we use the published port specified in the
+``docker run`` command.  **To review** the command used to start the container was:
 
-``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=develop
-f5devcentral/f5-super-netops-container:develop-jenkins``
+``docker run -p 8080:80 -p 2222:22 -p 10000:8080 --rm -it -e SNOPS_GH_BRANCH=master
+f5devcentral/f5-super-netops-container:jenkins``
 
 This will publish the standard Jenkins service on ``TCP/8080`` to ``TCP/10000`` on the
 Docker host.  In the case of the Jenkins service the following mapping applies:
 
 ``10.1.1.8:10000 -> f5-super-netops-container:8080``
 
-.. NOTE:: There is no bookmark in your browser, you may find it easier to
-   reference later if you create one after connecting the first time
+.. NOTE:: If you are using an F5 provided lab environment please use the browser and click the ‘Jenkins’ bookmark.
 
 To connect via HTTP open a web browser and enter the URL:
 
-``http://10.1.1.8:10000``
+``http://(YourDockerSever):10000``
 
 You should see a page like this:
 
@@ -161,4 +160,4 @@ You should see a page like this:
    :scale: 50%
 .. |image89| image:: /_static/class2/image089.png
    :align: middle
-   :scale: 50%
+   :scale: 95%

docs/class2/module1/module1.rst

@@ -1,21 +1,21 @@
 Module 1: f5-super-netops-container Toolkit
 ===========================================
 
-In this module we will explore how to use the **f5-super-netops** container
-toolkit to easily consume various F5 Automation, Orchestration, Super Netops and
-DevOps tools, along with frameworks.
+In this module we will explore how to use the **f5-super-netops-container**
+toolkit to easily integrate various F5 Automation, Orchestration, Super Netops and
+DevOps tools, along with framework technologies.
 
 The f5-super-netops-container is meant to provide a simple way for users to
 quickly duplicate a standard automation and orchestration environment in your
-local machine/lab environment.  The container is continuously updated to include
+local machine/lab environment.  The container is **continuously updated** to include
 the latest tools and documentation.
 
 The labs in this module will show you how to install the
 f5-super-netops-container image, start it in your local environment and access
 various tools and documentation.
 
-To install the f5-super-netops-container you need to be sure your system
-supports running Docker Community Edition (CE).  Please refer to
+To install the f5-super-netops-container your system mu st
+support running Docker Community Edition (CE).  Please refer to
 https://docs.docker.com/engine/installation/#platform-support-matrix for
 more information.
 

docs/class2/module2/lab1.rst

@@ -28,12 +28,13 @@ Perform the following steps to complete this task:
    ``https://raw.githubusercontent.com/0xHiteshPatel/f5-postman-workflows/master/F5_Postman_Workflows.postman_collection.json``
 
 #. You should now see a collection named ``F5_Postman_Workflows`` in your
-   Postman Collections sidebar
+   Postman Collections sidebar, in some cases the Collections dont appear until Postman
+   has been closed an relaunched.
 
 Task 2 - Install f5-postman-workflows into your Postman Client
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To utilize the helper functions the framework include we must install those
+To utilize the helper functions the framework includes, we must install those
 functions into the Postman Client.  The installation helpers perform the
 following tasks: