majic-ansible-roles Changeset

Changeset - 0c330b88956a

Parent rev.

Child rev.

[Not reviewed]

0 16 0

Branko Majic (branko) - 7 months ago 2024-09-09 16:42:51
branko@majic.rs

MAR-218: Switch to using task imports instead of includes:

- Should result in somewhat faster run, except the includes happen
during planning phase. None of the changed includes will have
problem with this.
- Solves the issue of (included) imported tasks not being tagged
properly, particularly in relation to the mechanism for explicitly
running all handlers.

16 files changed with 18 insertions and 18 deletions:

roles/backup/tasks/main.yml

roles/backup_client/tasks/main.yml

roles/backup_server/tasks/main.yml

roles/bootstrap/tasks/main.yml

roles/common/tasks/main.yml

roles/database/tasks/main.yml

roles/database_server/tasks/main.yml

roles/ldap_client/tasks/main.yml

roles/ldap_server/tasks/main.yml

roles/mail_forwarder/tasks/main.yml

roles/mail_server/tasks/main.yml

roles/php_website/tasks/main.yml

roles/preseed/tasks/main.yml

roles/web_server/tasks/main.yml

roles/wsgi_website/tasks/main.yml

roles/xmpp_server/tasks/main.yml

0 comments (0 inline, 0 general) First comment

roles/backup/tasks/main.yml

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ @@
     - Assemble Duply include patterns
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/backup_client/tasks/main.yml

➞

Show inline comments

@@ @@ -137,7 +137,7 @@ @@
     mode: "0600"
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/backup_server/tasks/main.yml

➞

Show inline comments

@@ @@ -154,7 +154,7 @@ @@
     - Restart ferm
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/bootstrap/tasks/main.yml

➞

Show inline comments

@@ @@ -37,7 +37,7 @@ @@
     state: absent
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/common/tasks/main.yml

➞

Show inline comments

@@ @@ -534,7 +534,7 @@ @@
     - Restart NTP server
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/database/tasks/main.yml

➞

Show inline comments

@@ @@ -16,11 +16,11 @@ @@
     column_case_sensitive: true
 - name: Enable backup
-  ansible.builtin.include_tasks: backup.yml
+  ansible.builtin.import_tasks: backup.yml
   when: enable_backup
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/database_server/tasks/main.yml

➞

Show inline comments

@@ @@ -34,7 +34,7 @@ @@
   when: mariadb_utf8_configuration.changed
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/ldap_client/tasks/main.yml

➞

Show inline comments

@@ @@ -22,7 +22,7 @@ @@
     mode: "0644"
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/ldap_server/tasks/main.yml

➞

Show inline comments

@@ @@ -278,11 +278,11 @@ @@
   changed_when: false
 - name: Enable backup
-  ansible.builtin.include_tasks: backup.yml
+  ansible.builtin.import_tasks: backup.yml
   when: enable_backup
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/mail_forwarder/tasks/main.yml

➞

Show inline comments

@@ @@ -118,7 +118,7 @@ @@
     state: present
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/mail_server/tasks/main.yml

➞

Show inline comments

@@ @@ -325,7 +325,7 @@ @@
     - Restart ferm
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/php_website/tasks/main.yml

➞

Show inline comments

@@ @@ -121,7 +121,7 @@ @@
     - Restart nginx
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/preseed/tasks/main.yml

➞

Show inline comments

@@ @@ -15,7 +15,7 @@ @@
   with_items: "{{ groups['all'] }}"
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/web_server/tasks/main.yml

➞

Show inline comments

@@ @@ -218,7 +218,7 @@ @@
     - Restart PHP-FPM
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/wsgi_website/tasks/main.yml

➞

Show inline comments

@@ @@ -313,7 +313,7 @@ @@
     - handlers
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

roles/xmpp_server/tasks/main.yml

➞

Show inline comments

@@ @@ -135,7 +135,7 @@ @@
     - Restart ferm
 - name: Explicitly run all handlers
-  ansible.builtin.include_tasks: ../handlers/main.yml
+  ansible.builtin.import_tasks: ../handlers/main.yml
   when: "run_handlers | default(False) | bool()"
   tags:
     - handlers

0 comments (0 inline, 0 general) First comment