diff --git a/playbook.yaml b/playbook.yaml index f48b2b4..177b759 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -18,5 +18,5 @@ # execute the role - name: "execute role: common" - ansible.builtin.include_role: + ansible.builtin.import_role: name: "common" diff --git a/tasks/main.yaml b/tasks/main.yaml index 0ec89d6..21b973b 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -7,34 +7,34 @@ # set hostname - name: "set hostname" - ansible.builtin.include_tasks: "hostname.yaml" + ansible.builtin.import_tasks: "hostname.yaml" when: "ansible_os_family == 'Debian'" tags: "hostname" # set locale - name: "set locale" - ansible.builtin.include_tasks: "locale.yaml" + ansible.builtin.import_tasks: "locale.yaml" when: "ansible_os_family == 'Debian'" tags: "locale" # environment - name: "environment" - ansible.builtin.include_tasks: "environment.yaml" + ansible.builtin.import_tasks: "environment.yaml" tags: "environment-file" # motd - name: "motd" - ansible.builtin.include_tasks: "motd.yaml" + ansible.builtin.import_tasks: "motd.yaml" tags: "motd" # cron jobs - name: "cron jobs" - ansible.builtin.include_tasks: "cron.yaml" + ansible.builtin.import_tasks: "cron.yaml" tags: "cron" # swap - name: "swap" - ansible.builtin.include_tasks: "swap.yaml" + ansible.builtin.import_tasks: "swap.yaml" when: - 'type == "vm"' - "ansible_os_family =='Debian'" @@ -43,18 +43,18 @@ # manage fstab - name: "manage fstab" - ansible.builtin.include_tasks: "fstab.yaml" + ansible.builtin.import_tasks: "fstab.yaml" tags: "fstab" # apk - name: "apk" - ansible.builtin.include_tasks: "apk/packages.yaml" + ansible.builtin.import_tasks: "apk/packages.yaml" when: 'ansible_os_family == "Alpine"' tags: "apk" # apt - name: "apt" - ansible.builtin.include_tasks: "apt/sources.yaml" + ansible.builtin.import_tasks: "apt/sources.yaml" when: "ansible_os_family == 'Debian'" tags: "apt" @@ -63,39 +63,39 @@ ansible.builtin.meta: "flush_handlers" - name: "apt - update" - ansible.builtin.include_tasks: "apt/update.yaml" + ansible.builtin.import_tasks: "apt/update.yaml" when: "ansible_os_family == 'Debian'" tags: "apt-update" - name: "apt - packages" - ansible.builtin.include_tasks: "apt/packages.yaml" + ansible.builtin.import_tasks: "apt/packages.yaml" when: "ansible_os_family == 'Debian'" tags: "apt" - name: "apt - config" - ansible.builtin.include_tasks: "apt/config.yaml" + ansible.builtin.import_tasks: "apt/config.yaml" when: "ansible_os_family == 'Debian'" tags: "apt" - name: "apt - cleanup" - ansible.builtin.include_tasks: "apt/cleanup.yaml" + ansible.builtin.import_tasks: "apt/cleanup.yaml" when: "ansible_os_family == 'Debian'" tags: "apt-cleanup" # manage profile - name: "manage profile" - ansible.builtin.include_tasks: "profile.yaml" + ansible.builtin.import_tasks: "profile.yaml" tags: "profile" # telemetry - name: "telemetry" - ansible.builtin.include_tasks: "telemetry.yaml" + ansible.builtin.import_tasks: "telemetry.yaml" when: "ansible_os_family == 'Debian'" tags: "telemetry" # service - name: "service" - ansible.builtin.include_tasks: "service.yaml" + ansible.builtin.import_tasks: "service.yaml" loop: "{{ service }}" loop_control: loop_var: "__service" @@ -109,7 +109,7 @@ # chrony - name: "ntp" - ansible.builtin.include_tasks: "ntp.yaml" + ansible.builtin.import_tasks: "ntp.yaml" when: 'type == "vm" or type == "hw"' tags: "ntp" @@ -119,12 +119,12 @@ # snap - name: "snap - daemon" - ansible.builtin.include_tasks: "snap/snap_daemon.yaml" + ansible.builtin.import_tasks: "snap/snap_daemon.yaml" when: "ansible_os_family == 'Debian'" tags: "snap" - name: "snap - package" - ansible.builtin.include_tasks: "snap/snap_package.yaml" + ansible.builtin.import_tasks: "snap/snap_package.yaml" when: - "snap_package is defined" - "ansible_os_family == 'Debian'" @@ -132,7 +132,7 @@ # lxd - name: "lxd" - ansible.builtin.include_tasks: "lxd.yaml" + ansible.builtin.import_tasks: "lxd.yaml" when: - 'type == "vm"' - "ansible_os_family == 'Debian'" @@ -144,7 +144,7 @@ # sysctl - name: "sysctl - set sysctl" - ansible.builtin.include_tasks: "sysctl.yaml" + ansible.builtin.import_tasks: "sysctl.yaml" loop: "{{ sysctl }}" loop_control: loop_var: "__sysctl" @@ -153,7 +153,7 @@ # systemctl - name: "sysctl - set systemctl" - ansible.builtin.include_tasks: "systemctl.yaml" + ansible.builtin.import_tasks: "systemctl.yaml" loop: "{{ systemctl }}" loop_control: loop_var: "__systemctl" @@ -164,12 +164,12 @@ # syslog - name: "syslog - install" - ansible.builtin.include_tasks: "syslog/install.yaml" + ansible.builtin.import_tasks: "syslog/install.yaml" when: "ansible_os_family == 'Debian'" tags: "syslog" - name: "syslog - config" - ansible.builtin.include_tasks: "syslog/config.yaml" + ansible.builtin.import_tasks: "syslog/config.yaml" when: "ansible_os_family == 'Debian'" tags: "syslog" @@ -179,7 +179,7 @@ # journald - name: "journald" - ansible.builtin.include_tasks: "journald.yaml" + ansible.builtin.import_tasks: "journald.yaml" when: "ansible_os_family == 'Debian'" tags: "journald" @@ -189,12 +189,12 @@ # timezone - name: "timezone" - ansible.builtin.include_tasks: "timezone.yaml" + ansible.builtin.import_tasks: "timezone.yaml" tags: "timezone" # sshd - name: "sshd" - ansible.builtin.include_tasks: "sshd.yaml" + ansible.builtin.import_tasks: "sshd.yaml" tags: "sshd" # flush handler @@ -203,7 +203,7 @@ # user - name: "user - create users" - ansible.builtin.include_tasks: "user.yaml" + ansible.builtin.import_tasks: "user.yaml" tags: "usermanagement" loop: "{{ users }}" loop_control: @@ -211,6 +211,6 @@ # firewall - name: "firewall" - ansible.builtin.include_tasks: "firewall.yaml" + ansible.builtin.import_tasks: "firewall.yaml" when: "ansible_os_family == 'Debian'" tags: "firewall"