Merge ~jfguedez/charm-openstack-service-checks:bug/1914115 into charm-openstack-service-checks:master

[Jose Guedez]

Cleanup when nrpe-external-master is removed

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:1daf37317b9311bc4c619fef72af0321bd25226f
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/20/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/127/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/521/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-openstack-service-checks-ci/20//rebuild

review: Needs Fixing (continuous-integration)

[Jose Guedez (jfguedez)]

CI failed, but it's unrelated to the changes, there seem to be network connectivity issues on the jenkins node:

2021-09-24 09:55:16 INFO: Recreating container "lp-charm-test-unit-withcompiler"
2021-09-24 09:55:16 INFO: Checking if container exists
2021-09-24 09:55:16 INFO: Running: lxc launch ubuntu:focal lp-charm-test-unit-withcompiler
Creating lp-charm-test-unit-withcompiler
Error: Failed instance creation: Get "https://cloud-images.ubuntu.com/releases/server/releases/focal/release-20210415/ubuntu-20.04-server-cloudimg-amd64-lxd.tar.xz": Unable to connect to: cloud-images.ubuntu.com:443
Build step 'Execute shell' marked build as failure
Finished: FAILURE

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision a9059f67025d346f10e0b2b427127f4b319ec3c8

diff --git a/src/reactive/openstack_service_checks.py b/src/reactive/openstack_service_checks.py
index 9c99652..d06f8e2 100644
--- a/src/reactive/openstack_service_checks.py
+++ b/src/reactive/openstack_service_checks.py
@@ -316,6 +316,18 @@ def parse_hooks():
         clear_flag("openstack-service-checks.configured")
 
 
+@when_not("nrpe-external-master.available")
+@when("openstack-service-checks.installed")
+@when("openstack-service-checks.configured")
+def nrpe_relation_reparted():
+    """Cleanup after the nrpe relation is removed."""
+    hookenv.log(
+        "nrpe-external-master not available (relation departed), clearing flags"
+    )
+    clear_flag("openstack-service-checks.installed")
+    clear_flag("openstack-service-checks.configured")
+
+
 def _set_keystone_error_workload_status(keystone_error):
     error_status_message = (
         "Failed to create endpoint checks due issue communicating with Keystone"