Merge pull request #813 from IPvSean/gh-pages

changing networking-workshop to network-workshop or f5-workshop depending on lab type

README.md

@@ -12,7 +12,7 @@ The Red Hat Ansible Automation Workshops project is intended for effectively dem
 | Workshop   | Presentation Deck  | Exercises  | Workshop Type Var   |
 |---|---|---|---|
 | **Ansible Red Hat Enterprise Linux Workshop** <br> focused on automating Linux platforms like Red Hat Enterprise Linux  | [Deck](./decks/ansible_rhel.pdf) | [Exercises](./exercises/ansible_rhel)  | `workshop_type: rhel`  |
-| **Ansible Network Automation Workshop** <br> focused on router and switch platforms like Arista, Cisco, Juniper   | [Deck](./decks/ansible_network.pdf) | [Exercises](./exercises/ansible_network)  | `workshop_type: networking`  |
+| **Ansible Network Automation Workshop** <br> focused on router and switch platforms like Arista, Cisco, Juniper   | [Deck](./decks/ansible_network.pdf) | [Exercises](./exercises/ansible_network)  | `workshop_type: network`  |
 | **Ansible F5 Workshop** <br> focused on automation of F5 BIG-IP  | [Deck](./decks/ansible_f5.pdf) | [Exercises](./exercises/ansible_f5)   | `workshop_type: f5` |
 | **Ansible Security Automation** <br> focused on automation of security tools like Check Point Firewall, IBM QRadar and the IDS Snort  | [Deck](./decks/ansible_security.pdf) | [Exercises](./exercises/ansible_security)   | `workshop_type: security` |
 | **Ansible Windows Automation Workshop** <br> focused on automation of Microsoft Windows  | [Deck](./decks/ansible_windows.pdf) | [Exercises](./exercises/ansible_windows)   | `workshop_type: windows` |
@@ -22,7 +22,7 @@ The Red Hat Ansible Automation Workshops project is intended for effectively dem
 
 # Self Paced Exercises
 
- - [Vagrant Demo](vagrant-demo) - Self-paced networking exercises that can be run on your personal laptop
+ - [Vagrant Demo](vagrant-demo) - Self-paced network automation exercises that can be run on your personal laptop
 
 # Demos
 

exercises/ansible_f5/1.0-explore/README.ja.md

@@ -11,19 +11,19 @@
 
 #### Step 1
 
-`networking-workshop` ディレクトリへ移動してください。
+`f5-workshop` ディレクトリへ移動してください。
 
 ```
-[student1@ansible ~]$ cd networking-workshop/
-[student1@ansible networking-workshop]$
+[student1@ansible ~]$ cd f5-workshop/
+[student1@ansible f5-workshop]$
 ```
 
 #### Step 2
 
 設定を確認するために `ansible` コマンドに `--version` オプションをつけて実行します:
 
 ```
-[student1@ansible networking-workshop]$ ansible --version
+[student1@ansible f5-workshop]$ ansible --version
 ansible 2.6.2
   config file = /home/student1/.ansible.cfg
   configured module search path = [u'/home/student1/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
@@ -43,14 +43,14 @@ ansible 2.6.2
 
 
 ```
-[student1@ansible networking-workshop]$ cat ~/.ansible.cfg
+[student1@ansible f5-workshop]$ cat ~/.ansible.cfg
 [defaults]
 connection = smart
 timeout = 60
 inventory = /home/student1/lab_inventory/hosts
 host_key_checking = False
 private_key_file = /home/student1/.ssh/aws-private.pem
-[student1@ansible networking-workshop]$
+[student1@ansible f5-workshop]$
 
 ```
 
@@ -65,7 +65,7 @@ Note: `ansible.cfg` には以下のパラメーターが含まれています:
 
 この演習では **ini** 形式で書かれたファイルを使います. `cat` コマンドでインベントリーの中身を確認します:
 
-`[student1@ansible networking-workshop]$ cat ~/lab_inventory/hosts`
+`[student1@ansible f5-workshop]$ cat ~/lab_inventory/hosts`
 
 以下が student2 の出力例です:
 ```
@@ -109,7 +109,7 @@ f5 ansible_host=34.199.128.69 ansible_user=admin private_ip=172.16.26.136 ansibl
 ホームディレクトリへ戻ります。
 
 ```
-[student1@ansible networking-workshop]$ cd ~
+[student1@ansible f5-workshop]$ cd ~
 ```
 
 本演習は以上となります。  [Click here to return to the lab guide](../README.ja.md)

exercises/ansible_f5/1.0-explore/README.md

@@ -6,19 +6,19 @@ Before you get started, please join us on slack! [Click here to join the ansible
 
 #### Step 1
 
-Navigate to the `networking-workshop` directory.
+Navigate to the `f5-workshop` directory.
 
 ```
-[student1@ansible ~]$ cd networking-workshop/
-[student1@ansible networking-workshop]$
+[student1@ansible ~]$ cd f5-workshop/
+[student1@ansible f5-workshop]$
 ```
 
 #### Step 2
 
 Run the `ansible` command with the `--version` command to look at what is configured:
 
 ```
-[student1@ansible networking-workshop]$ ansible --version
+[student1@ansible f5-workshop]$ ansible --version
 ansible 2.6.2
   config file = /home/student1/.ansible.cfg
   configured module search path = [u'/home/student1/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
@@ -38,14 +38,14 @@ Use the `cat` command to view the contents of the `ansible.cfg` file.
 
 
 ```
-[student1@ansible networking-workshop]$ cat ~/.ansible.cfg
+[student1@ansible f5-workshop]$ cat ~/.ansible.cfg
 [defaults]
 connection = smart
 timeout = 60
 inventory = /home/student1/lab_inventory/hosts
 host_key_checking = False
 private_key_file = /home/student1/.ssh/aws-private.pem
-[student1@ansible networking-workshop]$
+[student1@ansible f5-workshop]$
 
 ```
 
@@ -60,7 +60,7 @@ The scope of a `play` within a `playbook` is limited to the groups of hosts decl
 
 In this lab you will work with a file based inventory written in the **ini** format. Use the `cat` command to view the contents of your inventory:
 
-`[student1@ansible networking-workshop]$ cat ~/lab_inventory/hosts`
+`[student1@ansible f5-workshop]$ cat ~/lab_inventory/hosts`
 
 The output will look as follows with student2 being the respective student workbench:
 ```
@@ -105,7 +105,7 @@ f5 ansible_host=34.199.128.69 ansible_user=admin private_ip=172.16.26.136 ansibl
 Go back to the home directory
 
 ```
-[student1@ansible networking-workshop]$ cd ~
+[student1@ansible f5-workshop]$ cd ~
 ```
 
 You have finished this exercise.  [Click here to return to the lab guide](../README.md)

exercises/ansible_f5/1.1-get-facts/README.ja.md

@@ -19,7 +19,7 @@
 ホームディレクトリにいることを確認してください。
 
 ```
-[student1@ansible networking-workshop]$ cd ~
+[student1@ansible f5-workshop]$ cd ~
 ```
 
 ## Step 1:

exercises/ansible_f5/1.1-get-facts/README.md

@@ -19,7 +19,7 @@ Demonstrate use of the [BIG-IP Facts module](https://docs.ansible.com/ansible/la
 Make sure you are in the home directory
 
 ```
-[student1@ansible networking-workshop]$ cd ~
+[student1@ansible f5-workshop]$ cd ~
 ```
 
 ## Step 1:
@@ -118,17 +118,17 @@ The output will look as follows.
 ``` yaml
 [student1@ansible ~]$ ansible-playbook bigip-facts.yml
 
-PLAY [GRAB F5 FACTS] 
+PLAY [GRAB F5 FACTS]
 ****************************************************************
-TASK [Set a fact named 'provider' with BIG-IP login information] 
+TASK [Set a fact named 'provider' with BIG-IP login information]
 ****************************************************************
 ok: [f5]
 
-TASK [COLLECT BIG-IP FACTS] 
+TASK [COLLECT BIG-IP FACTS]
 ****************************************************************
 changed: [f5]
 
-TASK [DISPLAY COMPLETE BIG-IP SYSTEM INFORMATION] 
+TASK [DISPLAY COMPLETE BIG-IP SYSTEM INFORMATION]
 ****************************************************************
 
 ok: [f5] =>
@@ -176,17 +176,17 @@ ok: [f5] =>
         year: 2019
       uptime: 8196900.0
 
-TASK [DISPLAY ONLY THE MAC ADDRESS] 
+TASK [DISPLAY ONLY THE MAC ADDRESS]
 ****************************************************************
 ok: [f5] =>
   device_facts['system_info']['base_mac_address']: 02:f1:92:e9:a2:38
 
-TASK [DISPLAY ONLY THE VERSION] 
+TASK [DISPLAY ONLY THE VERSION]
 ****************************************************************
 ok: [f5] =>
   device_facts['system_info']['product_version']: 13.1.0.7
 
-PLAY RECAP 
+PLAY RECAP
 ****************************************************************
 f5                         : ok=4    changed=1    unreachable=0    failed=0
 ```

exercises/ansible_f5/3.0-as3-intro/README.ja.md

@@ -119,7 +119,7 @@ Playbook を作り始める前に、AS3 がどのように動くのか理解す
 
 ```
 mkdir j2
-cp ~/networking-workshop/3.0-as3-intro/j2/* j2/
+cp ~/f5-workshop/3.0-as3-intro/j2/* j2/
 ```
 
 ## Step 3:

exercises/ansible_f5/3.0-as3-intro/README.md

@@ -120,7 +120,7 @@ This template is a JSON representation of the Web Application.  The important pa
 <!-- {% raw %} -->
 ```
 mkdir j2
-cp ~/networking-workshop/3.0-as3-intro/j2/* j2/
+cp ~/f5-workshop/3.0-as3-intro/j2/* j2/
 ```
 <!-- {% endraw %} -->
 

exercises/ansible_f5/4.1-tower-job-template/README.md

@@ -55,7 +55,7 @@ To run an Ansible Playbook in Ansible Tower, we need to create a **Job Template*
 3. Login via SSH to your Ansible Tower control node (This is the Linux machine that has Ansible Tower installed on). The SSH credentials needed again here.
 4. Locate the flat-file that represents your Ansible inventory. Run the awx-manage inventory_import command like this
    ```
-   cd ~/networking-workshop/lab_inventory/
+   cd ~/f5-workshop/lab_inventory/
    sudo awx-manage inventory_import --source=hosts --inventory-name="Workshop Inventory"
    ```
 5. Now when you login via the WebUI you will see all the hosts under the inventory `Workshop Inventory`

exercises/ansible_f5/4.3-tower-workflow2/README.md

@@ -23,7 +23,7 @@
 
 # Objective
 
-Demonstrate anothe use case of [Ansible Tower workflow](https://docs.ansible.com/ansible-tower/latest/html/userguide/workflows.html) for F5 BIG-IP. 
+Demonstrate anothe use case of [Ansible Tower workflow](https://docs.ansible.com/ansible-tower/latest/html/userguide/workflows.html) for F5 BIG-IP.
 
 For this exercise, we will create a workflow for server patch management, first to disable the pool members, patch the nodes, and then enable the nodes. In parallel, we also attach an iRule to virtual server, to respond to the users when servers are under maintenance.
 
@@ -33,7 +33,7 @@ For this exercise, we will create a workflow for server patch management, first
 
 ### Create Server Credential
 Before creating templates, you should create one more credential `Server credential` beforehand, to be utilized by one of the jobs (`Patch server`) to access servers.
-   
+
 | Parameter | Value |
 |---|---|
 |Name | Server Credential |
@@ -144,7 +144,7 @@ Here is one example of the templates configured:
 
 ## Step 6: Create a converged link
 
-Lastly, we create a covergence link, which allows the jobs running in parallel to converge. In another word, when both jobs finish, `Detach iRule` node will trigger. 
+Lastly, we create a covergence link, which allows the jobs running in parallel to converge. In another word, when both jobs finish, `Detach iRule` node will trigger.
 
 1. Hover over the `Attach iRule to virtual server` node and click the blue chain symbol.
 2. Now, click on the existing `Detach iRule`. An ADD LINK window will appear. For the RUN parameter choose Always.

exercises/ansible_network/1-explore/README.ja.md

@@ -36,13 +36,13 @@
 
 ## Step 1
 
-コントローラーノードの `networking-workshop` ディレクトリへ移動します。プロンプトの `ansible` はホスト名を示し、これは正しいノード上にいることを示しています。
+コントローラーノードの `network-workshop` ディレクトリへ移動します。プロンプトの `ansible` はホスト名を示し、これは正しいノード上にいることを示しています。
 
 ```
-[student1@ansible ~]$ cd ~/networking-workshop/
-[student1@ansible networking-workshop]$
-[student1@ansible networking-workshop]$ pwd
-/home/student1/networking-workshop
+[student1@ansible ~]$ cd ~/network-workshop/
+[student1@ansible network-workshop]$
+[student1@ansible network-workshop]$ pwd
+/home/student1/network-workshop
 ```
  - `~` - チルダはホームディレクトリ `/home/student1` の短縮表記
  - `cd` - ディレクトリを移動するコマンド

exercises/ansible_network/1-explore/README.md

@@ -36,13 +36,13 @@ This will not require a username or password.
 
 ## Step 1
 
-Navigate to the `networking-workshop` directory on the Ansible control node.  The word `ansible` indicates the hostname, and that you are on the correct host.
+Navigate to the `network-workshop` directory on the Ansible control node.  The word `ansible` indicates the hostname, and that you are on the correct host.
 
 ```
-[student1@ansible ~]$ cd ~/networking-workshop/
-[student1@ansible networking-workshop]$
-[student1@ansible networking-workshop]$ pwd
-/home/student1/networking-workshop
+[student1@ansible ~]$ cd ~/network-workshop/
+[student1@ansible network-workshop]$
+[student1@ansible network-workshop]$ pwd
+/home/student1/network-workshop
 ```
  - `~` - the tilde in this context is a shortcut for `/home/student1`
  - `cd` - Linux command to change directory

exercises/ansible_network/2-first-playbook/README.ja.md

@@ -23,19 +23,19 @@
 
 #### Step 1
 
-`networking-workshop` ディレクトリを移動してください（別のディレクトリにいる場合）
+`network-workshop` ディレクトリを移動してください（別のディレクトリにいる場合）
 
 ```bash
-[student1@ansible ~]$ cd ~/networking-workshop/
-[student1@ansible networking-workshop]$
-[student1@ansible networking-workshop]$ pwd
-/home/student1/networking-workshop
+[student1@ansible ~]$ cd ~/network-workshop/
+[student1@ansible network-workshop]$
+[student1@ansible network-workshop]$ pwd
+/home/student1/network-workshop
 ```
 
 演習用に提供される `playbook.yml`を確認します。好きなエディタでこのファイルを開いてください。以下の例では `cat` コマンドを利用しています。
 
 ```
-[student1@ansible networking-workshop]$ cat playbook.yml
+[student1@ansible network-workshop]$ cat playbook.yml
 ---
 - name: snmp ro/rw string configuration
   hosts: cisco
@@ -65,7 +65,7 @@ snmp-server community ansible-private RW
 `ansible-playbook` コマンドを使ってこのPlaybookを実行します:
 
 ```bash
-[student1@ansible networking-workshop]$ ansible-playbook playbook.yml
+[student1@ansible network-workshop]$ ansible-playbook playbook.yml
 
 PLAY [snmp ro/rw string configuration] *****************************************
 
@@ -81,7 +81,7 @@ rtr1                       : ok=1    changed=1    unreachable=0    failed=0    s
 このPlaybookの動きを確認します。`rtr1`へログインし、Cisco IOS-XE上で実行中のコンフィグを確認します。
 
 ```bash
-[student1@ansible networking-workshop]$ ssh rtr1
+[student1@ansible network-workshop]$ ssh rtr1
 
 rtr1#show run | i snmp
 snmp-server community ansible-public RO
@@ -98,7 +98,7 @@ snmp-server community ansible-private RW
 冪等性を確認するには、Playbookを再実行します:
 
 ```bash
-[student1@ansible networking-workshop]$  ansible-playbook playbook.yml
+[student1@ansible network-workshop]$  ansible-playbook playbook.yml
 
 PLAY [snmp ro/rw string configuration] **************************************************************************************
 
@@ -108,7 +108,7 @@ ok: [rtr1]
 PLAY RECAP ******************************************************************************************************************
 rtr1                       : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0
 
-[student1@ansible networking-workshop]$
+[student1@ansible network-workshop]$
 ```
 
 > Note: **PLAY RECAP** の中の **changed** パラメーターが changed=0 であることを確認してください。
@@ -127,7 +127,7 @@ snmp-server community ansible-test RO
 好きなテキストエディタで `playbook.yml` を開いて、コマンドを追加します:
 
 ```bash
-[student1@ansible networking-workshop]$ nano playbook.yml
+[student1@ansible network-workshop]$ nano playbook.yml
 ```
 
 Playbookは以下のようになります:
@@ -154,7 +154,7 @@ Playbookは以下のようになります:
 
 
 ```bash
-[student1@ansible networking-workshop]$ ansible-playbook playbook.yml --verbose --check
+[student1@ansible network-workshop]$ ansible-playbook playbook.yml --verbose --check
 Using /home/student1/.ansible.cfg as config file
 
 PLAY [snmp ro/rw string configuration] *****************************************
@@ -180,7 +180,7 @@ rtr1                       : ok=1    changed=1    unreachable=0    failed=0    s
 `ansible-test` コミュニティが作成されていないことを確認します。`rtr1` へログインして、コンフィグ内容を確認してください。
 
 ```bash
-[student1@ansible networking-workshop]$ ssh rtr1
+[student1@ansible network-workshop]$ ssh rtr1
 
 rtr1#show run | i snmp
 snmp-server community ansible-public RO
@@ -193,7 +193,7 @@ snmp-server community ansible-private RW
 最後に、このPlaybookを `-v` `--check` オプションなしで再実行して、更新をプッシュします。
 
 ```bash
-[student1@ansible networking-workshop]$ ansible-playbook playbook.yml
+[student1@ansible network-workshop]$ ansible-playbook playbook.yml
 
 PLAY [snmp ro/rw string configuration] *****************************************
 
@@ -209,7 +209,7 @@ rtr1                       : ok=1    changed=1    unreachable=0    failed=0    s
 Playbookが設定した `ansible-test` コミュニティを確認します。`rtr1` へログインして、コンフィグ内容を確認してください。
 
 ```bash
-[student1@ansible networking-workshop]$ ssh rtr1
+[student1@ansible network-workshop]$ ssh rtr1
 
 rtr1#sh run | i snmp
 snmp-server community ansible-public RO