Merge pull request ansible#1193 from ansible/devel

June 11th, Release PR

.gitignore

@@ -36,3 +36,4 @@ Gemfile
 _site/*
 .tox/
 provisioner/tests/ci-common.yml
+*.gz

_config.yml

@@ -3,6 +3,7 @@ theme: jekyll-theme-dinky
 include:
   - "provisioner/README.md"
 exclude:
+  - "roles"
   - "provisioner/roles"
   - "provisioner/group_vars"
   - "provisioner/inventory"

docs/exercises.md

@@ -21,7 +21,7 @@ This can be customized!  There are three variables that you can change with your
    - `version` - points to the git [branch](https://git-scm.com/docs/git-branch) for the specified git repo.  By default this uses `master`
    - `refspec` - points to the git [refspec](https://git-scm.com/book/en/v2/Git-Internals-The-Refspec).  By default this is set to `""` (nothing).
 
-These variables are used in the `control_node` role which can found here: `provisioner/roles/control_node/tasks/main.yml`
+These variables are used in the `control_node` role which can found here: `roles/control_node/tasks/main.yml`
 
 
 ## Practical Example

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

@@ -43,7 +43,7 @@ ansible 2.9.14
 ```
 [student1@ansible f5-workshop]$ cat ~/.ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

exercises/ansible_f5/1.0-explore/README.md

@@ -38,7 +38,7 @@ Use the `cat` command to view the contents of the `ansible.cfg` file.
 ```
 [student1@ansible f5-workshop]$ cat ~/.ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

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

@@ -72,7 +72,7 @@ ansible 2.8.1
 ```
 [student1@ansible ~]$ cat ~/.ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

exercises/ansible_network/1-explore/README.md

@@ -74,7 +74,7 @@ Use the `cat` command to view the contents of the `ansible.cfg` file.
 ```bash
 [student1@ansible ~]$ cat ~/.ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

exercises/ansible_rhel/1.2-adhoc/README.es.md

@@ -94,7 +94,7 @@ Salida del contendio del archivo:
 ```bash
 [student<X>@ansible ~]$ cat .ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

exercises/ansible_rhel/1.2-adhoc/README.fr.md

@@ -95,7 +95,7 @@ Affichez le fichier de configuration:
 ```bash
 [student<X>@ansible ~]$ cat .ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

exercises/ansible_rhel/1.2-adhoc/README.ja.md

@@ -103,7 +103,7 @@ Ansible の動作は、Ansible の ini スタイル設定ファイルの内容
 ```bash
 [student<X>@ansible-1 ~]$ cat .ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

exercises/ansible_rhel/1.2-adhoc/README.md

@@ -93,7 +93,7 @@ Output the content of the file:
 ```bash
 [student<X>@ansible-1 ~]$ cat .ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

exercises/ansible_rhel/1.2-adhoc/README.pt-br.md

@@ -82,7 +82,7 @@ Saída do conteúdo do arquivo:
 ```bash
 [student<X>@ansible ~]$ cat .ansible.cfg
 [defaults]
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 connection = smart
 timeout = 60
 deprecation_warnings = False

galaxy.yml

@@ -1,11 +1,14 @@
 ---
 namespace: ansible
 name: workshops
-version: 0.0.1
+version: 0.0.2
 readme: README.md
 
 authors:
-  - Sean Cavanaugh <[email protected]>
+  - Sean Cavanaugh <[email protected]> @IPvSean
+  - Sašo Stanovnik @sstanovnik
+  - Colin McNaughton @colincloin
+  - Roland Wolters @liquidat
 
 build_ignore:
   - assets
@@ -15,6 +18,9 @@ build_ignore:
   - '*.tar.gz'
   - provisioner
   - vagrant-demo
+  - images
+  - _layouts
+  - docs
 
 
 # A short summary description of the collection
@@ -36,7 +42,26 @@ tags: []
 # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
 # range specifiers can be set and are separated by ','
 dependencies:
-  "awx.awx": "*"    # note: "*" selects the highest version available
+  # version 19.1.0 introduced a breaking change, fix likely to be released in 19.3.0
+  # https://github.com/ansible/awx/pull/10336
+  "awx.awx": "19.0.0"
+  "amazon.aws": "==1.5.0"
+  "arista.eos": "==2.1.2"
+  "ansible.netcommon": "==2.0.2"
+  "ansible.posix": "==1.2.0"
+  "ansible.product_demos": "==1.2.7"
+  "ansible.windows": "==1.5.0"
+  "chocolatey.chocolatey": "==1.1.0"
+  "cisco.ios": "2.0.1"
+  "community.aws": "==1.5.0"
+  "community.crypto": "==1.6.2"
+  "community.general": "==3.0.2"
+  "community.mysql": "==2.1.0"
+  "community.windows": "==1.3.0"
+  "f5networks.f5_modules": "==1.9.0"
+  "junipernetworks.junos": "==2.1.0"
+  "redhat_cop.tower_configuration": "==1.0.2"
+  "redhat_cop.tower_utilities": "==0.3.2"
 
 
 # The URL of the originating SCM repository

provisioner/ansible.cfg

@@ -9,7 +9,7 @@
 
 [defaults]
 interpreter_python = auto_silent
-stdout_callback = yaml
+stdout_callback = community.general.yaml
 inventory      = hosts
 forks          = 50
 host_key_checking = False

provisioner/devops.yml

@@ -3,6 +3,7 @@
   hosts: lab_hosts
   become: true
   gather_facts: false
-  roles:
-    - role: devops
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/devops"
       when: workshop_type == "devops"

provisioner/f5.yml

@@ -3,13 +3,17 @@
   hosts: lab_hosts
   become: true
   gather_facts: false
-  roles:
-    - {role: webservers}
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/webservers"
 
 - name: setup f5 nodes
   hosts: f5
   become: false
   connection: local
   gather_facts: false
-  roles:
-    - {role: f5_setup}
+  vars:
+    as3_uri: "https://github.com/F5Networks/f5-appsvcs-extension/releases"
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/f5_setup"

provisioner/middleware.yml

@@ -6,4 +6,4 @@
   tasks:
     - name: configure RHEL webservers
       include_role:
-        name: webservers
+        name: "{{ playbook_dir }}/../roles/webservers"

provisioner/network.yml

@@ -5,7 +5,7 @@
   tasks:
     - name: make sure routers have ssh reachability
       include_role:
-        name: connectivity_test
+        name: "{{ playbook_dir }}/../roles/connectivity_test"
         tasks_from: routers
 
 - name: change juniper password
@@ -16,34 +16,36 @@
   tasks:
     - name: configure juniper password
       include_role:
-        name: configure_routers
+        name: "{{ playbook_dir }}/../roles/configure_routers"
         tasks_from: juniper_default
       when: ansible_network_os == "junos"
 
 - name: gather aws facts for routers
   hosts: access,core
   connection: local
   gather_facts: false
-  roles:
-    - {role: gather_router_facts}
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/gather_router_facts"
 
 - name: configure access routers
   hosts: access
   connection: local
   gather_facts: false
 
-  roles:
-    - role: configure_routers
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/configure_routers"
       vars:
         type: access
 
 - name: configure core routers
   hosts: core
   connection: local
   gather_facts: false
-
-  roles:
-    - role: configure_routers
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/configure_routers"
       vars:
         type: core
       when:

provisioner/provision_lab.yml

@@ -7,11 +7,11 @@
   tasks:
     - name: run pre-check role to make sure workshop will complete provisioning
       include_role:
-        name: workshop_check_setup
+        name: "{{ playbook_dir }}/../roles/workshop_check_setup"
 
     - name: run AWS check setup if using AWS
       include_role:
-        name: aws_check_setup
+        name: "{{ playbook_dir }}/../roles/aws_check_setup"
 
 - name: Create lab instances in AWS
   hosts: localhost
@@ -30,8 +30,9 @@
   hosts: "managed_nodes:control_nodes:attendance"
   become: true
   gather_facts: false
-  roles:
-    - connectivity_test
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/connectivity_test"
 
 - name: Configure nginx on attendance host
   hosts: attendance
@@ -40,25 +41,28 @@
   tasks:
     - block:
         - include_role:
-            name: workshop_attendance_nginx
+            name: "{{ playbook_dir }}/../roles/workshop_attendance_nginx"
         - include_role:
-            name: workshop_attendance
+            name: "{{ playbook_dir }}/../roles/workshop_attendance"
       when: attendance|bool
 
 - name: wait for all security nodes to have SSH reachability
   hosts: "security_connection_check"
   become: true
   gather_facts: false
-  roles:
-    - connectivity_test
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/connectivity_test"
 
 - name: Configure common options on managed nodes and control nodes
   hosts: "managed_nodes:control_nodes"
   gather_facts: false
   become: true
-  roles:
-    - user_accounts
-    - common
+  tasks:
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/user_accounts"
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/common"
 
 - name: Configure /etc/hosts
   hosts: 'managed_nodes:control_nodes'
@@ -83,11 +87,12 @@
   pre_tasks:
     - debug:
         var: tower_license
-  roles:
-    - role: control_node
   tasks:
     - include_role:
-        name: code_server
+        name: "{{ playbook_dir }}/../roles/control_node"
+
+    - include_role:
+        name: "{{ playbook_dir }}/../roles/code_server"
       when:
         - code_server is defined
         - code_server
@@ -100,12 +105,12 @@
   become: true
   tasks:
     - include_role:
-        name: control_node
+        name: "{{ playbook_dir }}/../roles/control_node"
         tasks_from: package_dependencies
       when: create_cluster|bool
 
     - include_role:
-        name: control_node
+        name: "{{ playbook_dir }}/../roles/control_node"
         tasks_from: venv
       when: create_cluster|bool
 
@@ -116,7 +121,7 @@
   gather_facts: false
   tasks:
     - include_role:
-        name: aws_dns
+        name: "{{ playbook_dir }}/../roles/aws_dns"
       when:
         - dns_type is defined
         - dns_type == "aws"
@@ -132,7 +137,7 @@
   tasks:
     - name: run populate_tower role
       include_role:
-        name: populate_tower
+        name: "{{ playbook_dir }}/../roles/populate_tower"
       when:
         - towerinstall is defined
         - towerinstall|bool
@@ -146,7 +151,7 @@
   tasks:
     - name: install boinc-client and register
       include_role:
-        name: community_grid
+        name: "{{ playbook_dir }}/../roles/community_grid"
       when:
         - ibm_community_grid is defined
         - ibm_community_grid
@@ -159,7 +164,7 @@
   tasks:
     - name: install boinc-client and register
       include_role:
-        name: community_grid
+        name: "{{ playbook_dir }}/../roles/community_grid"
         tasks_from: auto_shutoff
       when:
         - ibm_community_grid is defined
@@ -201,7 +206,7 @@
   become: false
   gather_facts: false
   tasks:
-    - {include_role: {name: tower_request}, when: student_total > 9}
+    - {include_role: {name: "{{ playbook_dir }}/../roles/tower_request"}, when: student_total > 9}
 
 - name: print out information for instructor
   hosts: localhost