From f2bd55941af96252cfa92982e9a674b9f88a0f73 Mon Sep 17 00:00:00 2001 From: uumas Date: Thu, 27 Mar 2025 22:19:03 +0200 Subject: [PATCH] container -> service migration --- roles/alertmanager/tasks/main.yml | 3 +-- roles/dokuwiki/defaults/main.yml | 1 - roles/dokuwiki/tasks/main.yml | 3 +-- roles/grafana/tasks/main.yml | 5 ++--- roles/prometheus/tasks/main.yml | 7 +++---- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/roles/alertmanager/tasks/main.yml b/roles/alertmanager/tasks/main.yml index b4965a5..76f6ef6 100644 --- a/roles/alertmanager/tasks/main.yml +++ b/roles/alertmanager/tasks/main.yml @@ -1,8 +1,7 @@ --- - - name: Prometheus alertmanager container include_role: - name: container + name: service vars: docker_service: alertmanager docker_image: prom/alertmanager diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml index b984e6d..eb78a12 100644 --- a/roles/dokuwiki/defaults/main.yml +++ b/roles/dokuwiki/defaults/main.yml @@ -1,4 +1,3 @@ --- - dokuwiki_wiki_name: DokuWiki dokuwiki_admin_email: "{{ admin_email }}" diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml index 0bb4a78..824484a 100644 --- a/roles/dokuwiki/tasks/main.yml +++ b/roles/dokuwiki/tasks/main.yml @@ -1,8 +1,7 @@ --- - - name: Dokuwiki container import_role: - name: container + name: service vars: docker_service: dokuwiki docker_image: bitnami/dokuwiki diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index d4618e6..9ec33e0 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -1,8 +1,7 @@ --- - - name: Grafana container - import_role: - name: container + include_role: + name: service vars: docker_service: grafana docker_image: grafana/grafana diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index d3116b3..b14ad00 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -1,8 +1,7 @@ --- - - name: Prometheus container include_role: - name: container + name: service vars: docker_service: prometheus docker_image: prom/prometheus @@ -33,7 +32,7 @@ - name: Webhook container for prometheus include_role: - name: container + name: service vars: docker_service: prometheus_webhook docker_image: thecatlady/webhook @@ -47,7 +46,7 @@ - name: Blackbox exporter for prometheus include_role: - name: container + name: service vars: docker_service: blackbox_exporter docker_image: prom/blackbox-exporter