Consistency changes

Oefenweb · Sep 20, 2023 · 97d575c · 97d575c
1 parent 5bf0746
commit 97d575c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -6,4 +6,4 @@
     - name: include vars
       ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
     - name: include tasks
-      ansible.builtin.include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -8,4 +8,4 @@
   tasks: []
   # post_tasks:
   #   - name: include tasks
-  #     ansible.builtin.include: "{{ playbook_dir }}/../../tests/tasks/post.yml"
+  #     ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/post.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -19,15 +19,17 @@
     - autossh-tunnel-client
     - autossh-tunnel-client-install
 
-- ansible.builtin.include: configure.yml
+- name: configure
+  ansible.builtin.import_tasks: configure.yml
   tags:
     - configuration
     - autossh-tunnel-client
     - autossh-tunnel-client-configure
 
 - name: service
   block:
-    - ansible.builtin.include: service-initd.yml
+    - name: service-initd
+      ansible.builtin.import_tasks: service-initd.yml
   when: is_docker_guest
   tags:
     - configuration
@@ -37,12 +39,14 @@
 
 - name: service
   block:
-    - ansible.builtin.include: service-upstart.yml
+    - name: service upstart
+      ansible.builtin.import_tasks: service-upstart.yml
       when: ansible_service_mgr != 'systemd'
       tags:
         - autossh-tunnel-client-service-upstart
 
-    - ansible.builtin.include: service-systemd.yml
+    - name: service systemd
+      ansible.builtin.import_tasks: service-systemd.yml
       when: ansible_service_mgr == 'systemd'
       tags:
         - autossh-tunnel-client-service-systemd

diff --git a/tests/test.yml b/tests/test.yml
@@ -7,9 +7,9 @@
     - name: include vars
       ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
     - name: include tasks
-      ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../
 #  post_tasks:
 #    - name: include tasks
-#      ansible.builtin.include: "{{ playbook_dir }}/tasks/post.yml"
+#      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/post.yml"
diff --git a/tests/vagrant.yml b/tests/vagrant.yml
@@ -7,9 +7,9 @@
     - name: include vars
       ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
     - name: include tasks
-      ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../
   post_tasks:
     - name: include tasks
-      ansible.builtin.include: "{{ playbook_dir }}/tasks/post.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/post.yml"