commit e8efd4606e809988bf91556900a9cbeb3f091256
Author: Xav Paice <xav.paice@canonical.com>
Date:   Mon Sep 28 17:59:00 2020 +1300

    Add NRPE checks for services
    
    Adds the nrpe-external-master layer and checks for services managed by
    this charm.
    
    func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/433
    Layer PR: https://github.com/openstack-charmers/charm-layer-ovn/pull/23
    
    Change-Id: I6499c4d92d9c495f92f750061d82d06642c0ccfb
    Closes-Bug: #1896674

diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
index b5025a8..7252523 100644
--- a/src/tests/bundles/bionic-train.yaml
+++ b/src/tests/bundles/bionic-train.yaml
@@ -10,6 +10,10 @@ relations:
   - ovn-central:ovsdb
 - - ovn-chassis:certificates
   - vault:certificates
+- - ovn-chassis:nrpe-external-master
+  - nrpe:nrpe-external-master
+- - magpie:juju-info
+  - nrpe:general-info
 applications:
   mysql:
     charm: cs:~openstack-charmers-next/percona-cluster
@@ -29,4 +33,6 @@ applications:
       source: cloud:bionic-train
   ovn-chassis:
     series: bionic
-    charm: cs:~openstack-charmers-next/ovn-chassis
+    charm: ../../../ovn-chassis
+  nrpe:
+    charm: cs:nrpe
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
index 8c26ec8..b0925c1 100644
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -10,6 +10,10 @@ relations:
   - ovn-central:ovsdb
 - - ovn-chassis:certificates
   - vault:certificates
+- - ovn-chassis:nrpe-external-master
+  - nrpe:nrpe-external-master
+- - magpie:juju-info
+  - nrpe:general-info
 applications:
   mysql:
     charm: cs:~openstack-charmers-next/percona-cluster
@@ -30,3 +34,5 @@ applications:
   ovn-chassis:
     series: bionic
     charm: cs:~openstack-charmers-next/ovn-chassis
+  nrpe:
+    charm: cs:nrpe
diff --git a/src/tests/bundles/focal.yaml b/src/tests/bundles/focal.yaml
index d965683..27e17ef 100644
--- a/src/tests/bundles/focal.yaml
+++ b/src/tests/bundles/focal.yaml
@@ -40,6 +40,9 @@ applications:
     to:
       - '3'
 
+  nrpe:
+    charm: cs:nrpe
+
   ovn-central:
     charm: cs:~openstack-charmers-next/ovn-central
     num_units: 3
@@ -79,3 +82,7 @@ relations:
   - - 'ovn-chassis:certificates'
     - 'vault:certificates'
 
+  - - 'ovn-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
+  - - 'magpie:juju-info'
+    - 'nrpe:general-info'
diff --git a/src/tests/bundles/groovy.yaml b/src/tests/bundles/groovy.yaml
index d802226..bb85561 100644
--- a/src/tests/bundles/groovy.yaml
+++ b/src/tests/bundles/groovy.yaml
@@ -40,6 +40,9 @@ applications:
     to:
       - '3'
 
+  nrpe:
+    charm: cs:nrpe
+
   ovn-central:
     charm: cs:~openstack-charmers-next/ovn-central
     num_units: 3
@@ -79,3 +82,7 @@ relations:
   - - 'ovn-chassis:certificates'
     - 'vault:certificates'
 
+  - - 'ovn-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
+  - - 'magpie:juju-info'
+    - 'nrpe:general-info'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index e965d93..795b8af 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -19,6 +19,9 @@ target_deploy_status:
   vault:
     workload-status: blocked
     workload-status-message: Vault needs to be initialized
+  nrpe:
+    workload-status: blocked
+    workload-status-message: "Nagios server not configured or related"
 # Note that full end to end tests are performed with OVN in the
 # neutron-api-plugin-ovn and octavia charm gates
 configure: