diff --git a/handlers/main.yml b/handlers/main.yml index 52fdf94..5230a8f 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -5,7 +5,7 @@ state: restarted daemon_reload: true enabled: true - when: ansible_service_mgr == "systemd" + when: ansible_facts['service_mgr'] == "systemd" - name: Reload Netdata claiming state ansible.builtin.command: netdatacli reload-claiming-state diff --git a/tasks/add-debian-repository-deb822.yml b/tasks/add-debian-repository-deb822.yml new file mode 100644 index 0000000..5d351b4 --- /dev/null +++ b/tasks/add-debian-repository-deb822.yml @@ -0,0 +1,10 @@ +--- +- name: Add Netdata APT repository + ansible.builtin.deb822_repository: + name: netdata + uris: >- + {{ netdata_repository_url }}{{ netdata_release_channel_normalized }}/{{ + ansible_facts.distribution | lower }} + suites: "{{ ansible_facts['distribution_release'] | lower }}/" + signed_by: /etc/apt/keyrings/netdata.gpg + state: present diff --git a/tasks/add-debian-repository-legacy.yml b/tasks/add-debian-repository-legacy.yml new file mode 100644 index 0000000..b6c238a --- /dev/null +++ b/tasks/add-debian-repository-legacy.yml @@ -0,0 +1,10 @@ +--- +- name: Add Netdata APT source for older Ansible + ansible.builtin.copy: + dest: /etc/apt/sources.list.d/netdata.list + content: >- + deb [signed-by=/etc/apt/keyrings/netdata.gpg] + {{ netdata_repository_url }}{{ netdata_release_channel_normalized }}/{{ + ansible_facts.distribution | lower }} + {{ ansible_facts['distribution_release'] | lower }}/ + mode: "0644" diff --git a/tasks/install-debian.yml b/tasks/install-debian.yml index 4d95d9b..f6d3895 100644 --- a/tasks/install-debian.yml +++ b/tasks/install-debian.yml @@ -26,15 +26,25 @@ cmd: gpg --batch --yes --dearmor -o /etc/apt/keyrings/netdata.gpg /etc/apt/keyrings/netdata.asc creates: /etc/apt/keyrings/netdata.gpg - - name: Add repository - ansible.builtin.apt_repository: - filename: "netdata" - repo: >- - deb [signed-by=/etc/apt/keyrings/netdata.gpg] - {{ netdata_repository_url }}{{ netdata_release_channel_normalized }}/{{ - ansible_facts.distribution | lower }}/ - {{ ansible_distribution_release | lower }}/ + - name: Install deb822 repository dependency + ansible.builtin.apt: + name: python3-debian state: present + when: ansible_version.full is version('2.15', '>=') + + - name: Remove legacy Netdata repository file + ansible.builtin.file: + path: /etc/apt/sources.list.d/netdata.list + state: absent + when: ansible_version.full is version('2.15', '>=') + + - name: Add repository with deb822 + ansible.builtin.include_tasks: add-debian-repository-deb822.yml + when: ansible_version.full is version('2.15', '>=') + + - name: Add repository source for older Ansible + ansible.builtin.include_tasks: add-debian-repository-legacy.yml + when: ansible_version.full is version('2.15', '<') - name: Install package ansible.builtin.apt: diff --git a/tasks/install-opensuse.yml b/tasks/install-opensuse.yml index 2e5be5a..b6879ff 100644 --- a/tasks/install-opensuse.yml +++ b/tasks/install-opensuse.yml @@ -9,7 +9,7 @@ community.general.zypper: name: libnetfilter_acct1 state: present - when: ansible_distribution_major_version is version('16', '<') + when: ansible_facts['distribution_major_version'] is version('16', '<') - name: Set repository version path ansible.builtin.set_fact: