summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-06-22 22:18:51 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-06-22 22:18:51 +0200
commit3ad0fba7dc9acedfc65f87303de795ad8d0bbb96 (patch)
tree54c82b1c6dd2ba316d2773e2b2dd81d0ade0d26c
parentch-mon: remove rh-router config from prometheus (diff)
import some minor fixes from helsinki
-rw-r--r--roles/monitoring/prometheus/server/tasks/main.yml4
-rw-r--r--roles/network/bind/tasks/main.yml2
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/monitoring/prometheus/server/tasks/main.yml b/roles/monitoring/prometheus/server/tasks/main.yml
index 518ef73e..e93221d5 100644
--- a/roles/monitoring/prometheus/server/tasks/main.yml
+++ b/roles/monitoring/prometheus/server/tasks/main.yml
@@ -139,7 +139,9 @@
notify: reload prometheus
- name: generate password file prometheus server to access alertmanager
- when: "'basic_auth' in prometheus_server_alertmanager"
+ when:
+ - prometheus_server_alertmanager is defined
+ - "'basic_auth' in prometheus_server_alertmanager"
copy:
content: "{{ prometheus_server_alertmanager.basic_auth.password }}\n"
dest: /etc/prometheus/prometheus-alertmanager.password
diff --git a/roles/network/bind/tasks/main.yml b/roles/network/bind/tasks/main.yml
index 39f144f5..2303e76c 100644
--- a/roles/network/bind/tasks/main.yml
+++ b/roles/network/bind/tasks/main.yml
@@ -133,6 +133,7 @@
copy:
dest: "/etc/bind/db.{{ item.key }}"
src: "{{ item.value.file }}"
+ notify: reload bind
- name: install master zone files (from content)
when: bind_master_zones is defined
@@ -142,6 +143,7 @@
copy:
dest: "/etc/bind/db.{{ item.key }}"
content: "{{ item.value.content }}"
+ notify: reload bind
- name: enable/disable master zone configuration
lineinfile: