diff --git a/defaults/main.yml b/defaults/main.yml index 6c42fe3..b4af2d5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,7 +31,7 @@ userli_env_vars: - name: WKD_FORMAT value: "{{ userli_wkd_format }}" -userli_prometheus_textfile_collector_enabled: false +userli_prometheus_textfile_collector_enabled: False userli_prometheus_textfile_collector_path: "/var/lib/prometheus/node-exporter" userli_prometheus_textfile_collector_on_calendar: "*-*-* *:*:00" diff --git a/handlers/main.yml b/handlers/main.yml index 07aed5f..550a4b1 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,7 +1,6 @@ --- - name: Restart munin-node ansible.builtin.service: - service: name: munin-node state: restarted @@ -29,11 +28,11 @@ state: restarted - name: Reload systemd daemon - systemd: + ansible.builtin.systemd: daemon_reload: true - name: Restart userli-collector - service: + ansible.builtin.service: name: "{{ item }}" state: restarted loop: diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml deleted file mode 100644 index 198ca50..0000000 --- a/molecule/default/requirements.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -roles: - - name: weareinteractive.apt - - name: geerlingguy.apache - - name: geerlingguy.php - - name: systemli.mariadb diff --git a/molecule/localhost/molecule.yml b/molecule/localhost/molecule.yml index 68bb341..fb56eb1 100644 --- a/molecule/localhost/molecule.yml +++ b/molecule/localhost/molecule.yml @@ -2,7 +2,6 @@ dependency: name: galaxy options: - role-file: molecule/default/requirements.yml force: false driver: diff --git a/requirements.yml b/requirements.yml index 9cb8cca..d45f806 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,5 +1,4 @@ --- - collections: - community.general - community.mysql diff --git a/tasks/main.yml b/tasks/main.yml index 6f764f8..15895e1 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -105,5 +105,5 @@ when: userli_munin | bool - name: Import metrics tasks - import_tasks: metrics.yml + ansible.builtin.import_tasks: metrics.yml when: userli_prometheus_textfile_collector_enabled | bool