diff options
Diffstat (limited to 'roles/network')
| -rw-r--r-- | roles/network/handlers/main.yml | 6 | ||||
| -rw-r--r-- | roles/network/tasks/main.yml | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/roles/network/handlers/main.yml b/roles/network/handlers/main.yml index 8bd5cdec..45306362 100644 --- a/roles/network/handlers/main.yml +++ b/roles/network/handlers/main.yml @@ -3,7 +3,7 @@ become: true ansible.builtin.systemd_service: daemon_reload: true - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "Restart NetworkManager" become: true @@ -11,7 +11,7 @@ name: "NetworkManager" enabled: true state: "restarted" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "Restart systemd-resolved" become: true @@ -19,5 +19,5 @@ name: "systemd-resolved" enabled: true state: "restarted" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] failed_when: false diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index a3483891..394ec688 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -1,9 +1,9 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_facts['distribution'] | lower }}.yml" - name: "Include OS-specific tasks" - ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" - name: "Validate network_ipv4_* params" ansible.builtin.assert: @@ -28,14 +28,14 @@ enabled: true state: "started" loop: "{{ network_enabled_services }}" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "(chroot): Ensure network enabled services are enabled" ansible.builtin.command: cmd: "systemctl enable {{ item }}" changed_when: true loop: "{{ network_enabled_services }}" - when: ansible_is_chroot + when: ansible_facts['is_chroot'] # noqa: command-instead-of-module module doesn't work inside chroot - name: "Ensure network disabled services are masked" @@ -45,14 +45,14 @@ masked: true state: "stopped" loop: "{{ network_disabled_services }}" - when: not ansible_is_chroot + when: not ansible_facts['is_chroot'] - name: "(chroot): Ensure network disabled services are masked" ansible.builtin.command: cmd: "systemctl mask {{ item }}" changed_when: true loop: "{{ network_disabled_services }}" - when: ansible_is_chroot + when: ansible_facts['is_chroot'] # noqa: command-instead-of-module module doesn't work inside chroot - name: "Configure NetworkManager" |