From de5552e0bcfbeb313281da6ecf9c28a1e7b87b72 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras <evangelos@foutrelis.com> Date: Sun, 23 Oct 2022 12:22:46 +0300 Subject: [PATCH] hosts: get rid of dedicated_servers group This has become outdated (missing new dedicated servers) and its usage can be replicated by checking if ansible_virtualization_role == "host". For Ansible ad hoc commands, '!hcloud' can be used to the same effect. --- hosts | 7 ------- roles/prometheus_exporters/tasks/main.yml | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/hosts b/hosts index fd4736ec3..d7db9727e 100644 --- a/hosts +++ b/hosts @@ -105,13 +105,6 @@ europe.mirror.pkgbuild.com repro2.pkgbuild.com runner1.archlinux.org -[dedicated_servers] -build.archlinux.org -gemini.archlinux.org -runner1.archlinux.org -runner2.archlinux.org -secure-runner1.archlinux.org - [hcloud] accounts.archlinux.org archlinux.org diff --git a/roles/prometheus_exporters/tasks/main.yml b/roles/prometheus_exporters/tasks/main.yml index 185e9c922..247be3dc6 100644 --- a/roles/prometheus_exporters/tasks/main.yml +++ b/roles/prometheus_exporters/tasks/main.yml @@ -7,7 +7,7 @@ - name: Install smartmontools for dedicated servers pacman: name=smartmontools state=present - when: "'dedicated_servers' in group_names" + when: ansible_virtualization_role == "host" - name: Install prometheus-memcached-exporter pacman: name=prometheus-memcached-exporter state=present @@ -90,15 +90,15 @@ - name: Install smart textcollector service template: src=prometheus-smart-textcollector.service.j2 dest=/etc/systemd/system/prometheus-smart-textcollector.service owner=root group=root mode=644 - when: "'dedicated_servers' in group_names" + when: ansible_virtualization_role == "host" - name: Install smart textcollector timer template: src=prometheus-smart-textcollector.timer.j2 dest=/etc/systemd/system/prometheus-smart-textcollector.timer owner=root group=root mode=644 - when: "'dedicated_servers' in group_names" + when: ansible_virtualization_role == "host" - name: Enable and start prometheus smart textcollector timer systemd: name=prometheus-smart-textcollector.timer enabled=yes daemon_reload=yes state=started - when: "'dedicated_servers' in group_names" + when: ansible_virtualization_role == "host" - name: Install hetzner textcollector service template: src=prometheus-hetzner-textcollector.service.j2 dest=/etc/systemd/system/prometheus-hetzner-textcollector.service owner=root group=root mode=644 -- GitLab