From 9539ffdf889ad539c7d70b5f40f9d1380ae15f83 Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Mon, 30 Oct 2023 12:30:37 -0500 Subject: [PATCH] resolve woke issues --- reactive/docker.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/reactive/docker.py b/reactive/docker.py index b51d682..df1db8e 100644 --- a/reactive/docker.py +++ b/reactive/docker.py @@ -38,6 +38,8 @@ from charms import layer +NRPE_PRIMARY = "nrpe-external-master" # wokeignore: master + # 2 Major events are emitted from this layer. # # `docker.ready` is an event intended to signal other layers that need to @@ -609,18 +611,18 @@ def dockerhost_connected(dockerhost): dockerhost.configure(Docker().socket) -@when("nrpe-external-master.available") -@when_not("nrpe-external-master.docker.initial-config") +@when(f"{NRPE_PRIMARY}.available") +@when_not(f"{NRPE_PRIMARY}.docker.initial-config") def initial_nrpe_config(): """ :return: None """ - set_state("nrpe-external-master.docker.initial-config") + set_state(f"{NRPE_PRIMARY}.docker.initial-config") update_nrpe_config() @when("docker.ready") -@when("nrpe-external-master.available") +@when(f"{NRPE_PRIMARY}.available") @when_any("config.changed.nagios_context", "config.changed.nagios_servicegroups") def update_nrpe_config(): """ @@ -638,13 +640,13 @@ def update_nrpe_config(): nrpe_setup.write() -@when_not("nrpe-external-master.available") -@when("nrpe-external-master.docker.initial-config") +@when_not(f"{NRPE_PRIMARY}.available") +@when(f"{NRPE_PRIMARY}.docker.initial-config") def remove_nrpe_config(): """ :return: None """ - remove_state("nrpe-external-master.docker.initial-config") + remove_state(f"{NRPE_PRIMARY}.docker.initial-config") # List of systemd services for which the checks will be removed. services = ["docker"]