From 34cc100e7c5f92af0ecf238b3d9d04f150dda60c Mon Sep 17 00:00:00 2001
From: dspolleke <dspolleke@gmail.com>
Date: Mon, 12 Apr 2021 17:43:47 +0200
Subject: [PATCH 1/2] fixed it the way GG wants it fixed

---
 main.yml                 | 16 ++++++----
 tasks/extra-packages.yml | 63 +++++++++++++++++++---------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/main.yml b/main.yml
index b35b077..6296dc2 100644
--- a/main.yml
+++ b/main.yml
@@ -22,23 +22,27 @@
       tags: ['mas']
 
   tasks:
-    - include_tasks: tasks/ansible-setup.yml
+    - import_tasks: tasks/ansible-setup.yml
+      tags: ['setup']
 
-    - include_tasks: tasks/sudoers.yml
+    - import_tasks: tasks/sudoers.yml
       when: configure_sudoers
+      tags: ['sudoers']
 
-    - include_tasks: tasks/terminal.yml
+    - import_tasks: tasks/terminal.yml
       when: configure_terminal
+      tags: ['terminal']
 
-    - include_tasks: tasks/osx.yml
+    - import_tasks: tasks/osx.yml
       when: configure_osx
       tags: ['osx']
 
-    - include_tasks: tasks/extra-packages.yml
+    - import_tasks: tasks/extra-packages.yml
       tags: ['extra-packages']
 
     - name: Run configured post-provision ansible task files.
-      include_tasks: "{{ outer_item }}"
+      import_tasks: "{{ outer_item }}"
       loop_control:
         loop_var: outer_item
       with_fileglob: "{{ post_provision_tasks|default(omit) }}"
+      tags: ['post']
diff --git a/tasks/extra-packages.yml b/tasks/extra-packages.yml
index d55f78a..677148b 100644
--- a/tasks/extra-packages.yml
+++ b/tasks/extra-packages.yml
@@ -1,37 +1,34 @@
 ---
-- name: Ensure extra packages
-  block:
-  - name: Install global Composer packages.
-    composer:
-      command: "{{ (item.state | default('present') == 'absent') | ternary('remove', 'require') }}"
-      arguments: "{{ item.name | default(item) }} {{ item.version | default('@stable') }}"
-      # Ansible 2.4 supports `global_command` making `working_dir` optional.
-      working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}"
-    loop: "{{ composer_packages }}"
+- name: Install global Composer packages.
+  composer:
+    command: "{{ (item.state | default('present') == 'absent') | ternary('remove', 'require') }}"
+    arguments: "{{ item.name | default(item) }} {{ item.version | default('@stable') }}"
+    # Ansible 2.4 supports `global_command` making `working_dir` optional.
+    working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}"
+  loop: "{{ composer_packages }}"
 
-  - name: Install global NPM packages.
-    npm:
-      name: "{{ item.name | default(item) }}"
-      state: "{{ item.state | default('present') }}"
-      version: "{{ item.version | default(omit) }}"
-      global: true
-      executable: "{{ item.executable | default(omit) }}"
-    loop: "{{ npm_packages }}"
+- name: Install global NPM packages.
+  npm:
+    name: "{{ item.name | default(item) }}"
+    state: "{{ item.state | default('present') }}"
+    version: "{{ item.version | default(omit) }}"
+    global: true
+    executable: "{{ item.executable | default(omit) }}"
+  loop: "{{ npm_packages }}"
 
-  - name: Install global Pip packages.
-    pip:
-      name: "{{ item.name | default(item) }}"
-      state: "{{ item.state | default('present') }}"
-      version: "{{ item.version | default(omit) }}"
-      executable: "{{ item.executable | default(omit) }}"
-    loop: "{{ pip_packages }}"
+- name: Install global Pip packages.
+  pip:
+    name: "{{ item.name | default(item) }}"
+    state: "{{ item.state | default('present') }}"
+    version: "{{ item.version | default(omit) }}"
+    executable: "{{ item.executable | default(omit) }}"
+  loop: "{{ pip_packages }}"
 
-  - name: Install global Ruby gems.
-    gem:
-      name: "{{ item.name | default(item) }}"
-      state: "{{ item.state | default('present') }}"
-      version: "{{ item.version | default(omit) }}"
-      user_install: false
-      executable: "{{ item.executable | default(omit) }}"
-    loop: "{{ gem_packages }}"
-  tags: ['extra-packages']
+- name: Install global Ruby gems.
+  gem:
+    name: "{{ item.name | default(item) }}"
+    state: "{{ item.state | default('present') }}"
+    version: "{{ item.version | default(omit) }}"
+    user_install: false
+    executable: "{{ item.executable | default(omit) }}"
+  loop: "{{ gem_packages }}"

From beac53608e85b3bc1880ebb1f91ce78c59280525 Mon Sep 17 00:00:00 2001
From: dspolleke <dspolleke@gmail.com>
Date: Mon, 12 Apr 2021 19:13:23 +0200
Subject: [PATCH 2/2] imclude_tasks are sometimes useful

---
 main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.yml b/main.yml
index 6296dc2..caf41f8 100644
--- a/main.yml
+++ b/main.yml
@@ -41,7 +41,7 @@
       tags: ['extra-packages']
 
     - name: Run configured post-provision ansible task files.
-      import_tasks: "{{ outer_item }}"
+      include_tasks: "{{ outer_item }}"
       loop_control:
         loop_var: outer_item
       with_fileglob: "{{ post_provision_tasks|default(omit) }}"