Merge pull request #255 from puzzle/psc_corrections

newest refinements after last workshop

Author: friendlypenguin

content/en/docs/01/_index.en.md

@@ -184,7 +184,7 @@ ansible all -i hosts -m ansible.builtin.ping
 
 * Configure the `ansible` user to have root privilege on all hosts in your inventory file.
 Also enable login without a password for this user.
-* Test the functionality by running `sudo -v` as user `ansible` on all nodes.
+* Test the functionality by running `sudo -v` as user `ansible` on all nodes. No output after `sudo -v` indicates that the sudoers configuration is set up correctly.
 
 {{% details title="Solution Task 4" %}}
 

content/en/docs/03/_index.en.md

@@ -145,17 +145,17 @@ Complete the next steps using ansible ad hoc commands:
 Possible solution 1:
 
 ```bash
-ansible node2 -i hosts -m file -a "path=/home/ansible/testfile.txt state=touch"
-ansible node2 -i hosts -m copy -a "dest=/home/ansible/testfile.txt content='SOME RANDOM TEXT'"
-ansible node2 -i hosts -m file -a "path=/home/ansible/testfile.txt state=absent"
+ansible node2 -i hosts -m ansible.builtin.file -a "path=/home/ansible/testfile.txt state=touch"
+ansible node2 -i hosts -m ansible.builtin.copy -a "dest=/home/ansible/testfile.txt content='SOME RANDOM TEXT'"
+ansible node2 -i hosts -m ansible.builtin.file -a "path=/home/ansible/testfile.txt state=absent"
 ```
 
 Possible solution 2:
 The copy module can create the file directly
 
 ```bash
-ansible node2 -i hosts -m copy -a "dest=/home/ansible/testfile.txt content='SOME RANDOM TEXT'"
-ansible node2 -i hosts -m file -a "path=/home/ansible/testfile.txt state=absent"
+ansible node2 -i hosts -m ansible.builtin.copy -a "dest=/home/ansible/testfile.txt content='SOME RANDOM TEXT'"
+ansible node2 -i hosts -m ansible.builtin.file -a "path=/home/ansible/testfile.txt state=absent"
 ```
 {{% /details %}}
 

content/en/docs/05/01/_index.en.md

@@ -16,6 +16,10 @@ then do create a file `README.TXT` in this folder containing the text "This fold
 * The value of `<timestamp>` should contain a quite accurate timestamp of when `ansible-playbook` was run.
 * Run the playbook several times to see if it is really idempotent.
 
+{{% alert title="Hint" color="primary" %}}
+There is an ansible fact for when ansible was run.
+{{% /alert %}}
+
 {{% details title="Solution Task 1" %}}
 Below is a possible solution:
 

content/en/docs/05/_index.en.md

@@ -82,8 +82,8 @@ $ ansible-playbook webserver.yml
 ### Task 4
 
 * Create a new role called `base`.
-Its file `tasks/main.yml` should import the files `motd.yml` and `packages.yml`.
-(Create both files under `tasks/`).
+Its file `tasks/main.yml` should import the taskfiles `motd.yml` and `packages.yml` by using the `import_tasks` module. Create the two files `motd.yml` and `packages.yml` under `tasks/`.
+* Tag the import of the `motd.yml` file with the string `motd` and the import of the `packages.yml` file with the string `packages`.
 * `motd.yml` should do the following: Use the variable `base_motd_content` to change the `/etc/motd` content to
 "This is a server\\n".
 Remember to move the template as well as the variable to a correct location in the `roles` folder.
@@ -163,6 +163,7 @@ Take notice of the different content of `/etc/motd` on the control node!
 Use a dependency in the `meta/main.yml` file.
 * Remove the play to run `base` role on all hosts in the `prod.yml` playbook.
 Run the playbook and see if role `base` was applied on hosts in the `web` group as well.
+* Run the the playbook once with the tag `motd` and once with the tag `packages`. Ensure, that only the tasks where run where the corresponding tag was set.
 
 {{% details title="Solution Task 5" %}}
 
@@ -179,6 +180,8 @@ $ cat prod.yml
     - httpd
 
 $ ansible-playbook prod.yml
+$ ansible-playbook prod.yml -t motd
+$ ansible-playbook prod.yml -t packages
 ```
 
 {{% /details %}}

content/en/docs/06/_index.en.md

@@ -188,6 +188,12 @@ ansible-playbook secretservice.yml
 ansible node1,node2 -i hosts -b -m ansible.builtin.file -a "path=/etc/MI6 state=absent"
 ```
 
+If you moved the inventory file `hosts` in the labs before, then ensure to use the correct location:
+
+```bash
+ansible node1,node2 -i inventory/hosts -b -m ansible.builtin.file -a "path=/etc/MI6 state=absent"
+```
+
 {{% /details %}}
 
 ### Task 7

slides/ansible-techlab/puzzle-demo.md

@@ -1037,6 +1037,28 @@ Templates sind dazu da, um komplexe Files zu erstellen (Variabeln sowie `if` / `
 {{ vm.ip }}  {{ vm.name }}
 {% endfor %}
 ```
+
+<!-- .slide: class="master-content" > -->
+***
+
+## Playbook Keywords
+
+- "Functionality" / "Behaviour"
+- Different for Play/Task/Role/Block
+- https://docs.ansible.com/ansible/latest/reference_appendices/playbooks_keywords.html
+
+<!-- .slide: class="master-content" > -->
+***
+
+## Keyword examples
+
+- register
+- no_log
+- run_once
+- retry
+- delay
+- until
+
 <!-- .slide: class="master-content" > -->
 ***
 
@@ -1045,6 +1067,8 @@ Templates sind dazu da, um komplexe Files zu erstellen (Variabeln sowie `if` / `
 - https://docs.ansible.com/ansible/latest/user_guide/playbooks_tags.html
 
 <!-- .slide: class="master-content" > -->
+
+
 ***
 ## Tags
 Example:
@@ -1427,7 +1451,7 @@ The task's value of `notify` must match the handler's value of `name` or `listen
 ## Handlers
 Example Playbook:
 
-```yaml [1|2-9|10-14]
+```yaml [9|11]
 - hosts: all
   tasks:
     - name: Write configuration file
@@ -1448,7 +1472,7 @@ Example Playbook:
 ## Handlers
 Example Playbook:
 
-```yaml [9|10|11|15]
+```yaml [9|11|15]
 - hosts: all
   tasks:
     - name: Put configuration file
@@ -1485,11 +1509,10 @@ Caveat:
 
 → best practice: use `listen`
 <!-- .slide: class="master-content" > -->
-***
+
 ## Handlers
 Only the second handler will run when a task notifies `restart web services`
-
-```yaml
+```yaml [1-9|2,6]
 handlers:
   - name: restart web services
     ansible.builtin.systemd_service:
@@ -1501,10 +1524,13 @@ handlers:
       state: restarted
 ```
 <!-- .slide: class="master-content" > -->
+
+***
+
 ***
 ## Handlers
 Both handlers are run when a task notifies `restart web services`
-```yaml [6,11]
+```yaml [1-11|6,11]
 handlers:
   - name: Restart memcached
     ansible.builtin.service:
@@ -1518,6 +1544,7 @@ handlers:
     listen: "restart web services"
 ```
 <!-- .slide: class="master-content" > -->
+
 ***
 ## Handlers
 That was not entirely true...
@@ -1526,13 +1553,15 @@ That was not entirely true...
   become: true
   pre_tasks:
     - name: ...
+  roles:
+    - myrole
   tasks:
     - name: ...
   post_tasks:
     - name: ...
 ```
 
-Handlers are triggered after pre_tasks, tasks, post_tasks...
+Handlers are triggered after pre_tasks, roles, tasks, post_tasks...
 <!-- .slide: class="master-content" > -->
 ***
 ## Error Handling
@@ -1551,7 +1580,7 @@ Continue even when task failed:
 ## Error-Handling
 Define failed from output of command:
 
-```yaml
+```yaml [1-5|5]
 - name: See if my service is running
   ansible.builtin.command:
     cmd: systemctl status my_service
@@ -1571,11 +1600,12 @@ https://docs.ansible.com/ansible/latest/user_guide/playbooks_error_handling.html
   always:
     # do this always
 ```
+--> kind of rollback mechanism
 <!-- .slide: class="master-content" > -->
 ***
 ## Bonus Level: Blocks!
 
-```yaml
+```yaml [1-16|2-7|8-11|12-16]
 - name: Demonstrating error handling in blocks
   block:
     - name: I force a failure
@@ -1597,21 +1627,44 @@ https://docs.ansible.com/ansible/latest/user_guide/playbooks_error_handling.html
 ***
 ## Bonus Level: Blocks!
 Blocks can come in handy to group `when` clauses:
-```yaml
+```yaml [1-7|2|2,3] 
 - name: Grouping two debugs together
-  when: 'web' in groups <- 'when'-statement before 'block' for better readability
+  when: 'web' in groups # 'when'-statement before 'block' for better readability
   block:
     - ansible.builtin.debug:
         msg: 'this task...'
     - ansible.builtin.debug:
         msg: '...and this task will run if the host is in the web group'
+```
+<!-- .slide: class="master-content" > -->
 
+***
+## Bonus Level: Blocks!
+```yaml
+- name: loops over blocks don't work...
+  block:
+    - name: ...
+  loop:
+    - gentoo
+    - ubuntu
 ```
 
-But: You cannot loop over a `block`.
+Use loops with `ansible.builtin.include_tasks` instead!
+
+<!-- .slide: class="master-content" > -->
+
+***
+## Bonus Level: Blocks!
+```yaml
+- name: loop over include_tasks
+  ansible.builtin.include_tasks: taskfile.yml
+  loop:
+    - gentoo
+    - ubuntu
+```
 
-Use loops with `ansible.builtin.include_tasks` instead
 <!-- .slide: class="master-content" > -->
+
 ***
 # Lab 5.1: Ansible Roles - Handlers and Blocks