try moving this up a level to the overriding group

2017-05-01 21:28:28 +00:00 · 2017-05-01 21:28:28 +00:00 · a8e58addc9
commit a8e58addc9
parent 3ac2140c3f
21 changed files with 10 additions and 76 deletions
--- a/inventory/group_vars/buildaarch64
+++ b/inventory/group_vars/buildaarch64
@ -24,7 +24,3 @@ csi_relationship: |
  * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
  * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
  * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@ -26,7 +26,3 @@ docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildarm-stg
+++ b/inventory/group_vars/buildarm-stg
@ -26,7 +26,3 @@ docker_registry: "candidate-registry.stg.fedoraproject.org"
 source_registry: "registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/builders
+++ b/inventory/group_vars/builders
@ -0,0 +1,5 @@
+---
+# nagios items
+# We don't use nrpe to check any of the builders
+nagios_Check_Services:
+  nrpe: false
--- a/inventory/group_vars/builders-stg
+++ b/inventory/group_vars/builders-stg
@ -0,0 +1,5 @@
+---
+# nagios items
+# We don't use nrpe to check any of the builders
+nagios_Check_Services:
+  nrpe: false
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@ -27,7 +27,3 @@ docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildppc
+++ b/inventory/group_vars/buildppc
@ -32,7 +32,3 @@ csi_relationship: |
  * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
  * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
  * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildppcle
+++ b/inventory/group_vars/buildppcle
@ -32,7 +32,3 @@ csi_relationship: |
  * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
  * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
  * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@ -39,7 +39,3 @@ docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-aarch64
+++ b/inventory/group_vars/buildvm-aarch64
@ -44,7 +44,3 @@ docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-aarch64-stg
+++ b/inventory/group_vars/buildvm-aarch64-stg
@ -45,7 +45,3 @@ source_registry: "registry.stg.fedoraproject.org"
 docker_registry: "candidate-registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-armv7
+++ b/inventory/group_vars/buildvm-armv7
@ -44,7 +44,3 @@ docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-armv7-stg
+++ b/inventory/group_vars/buildvm-armv7-stg
@ -45,7 +45,3 @@ source_registry: "registry.stg.fedoraproject.org"
 docker_registry: "candidate-registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-ppc64
+++ b/inventory/group_vars/buildvm-ppc64
@ -42,7 +42,3 @@ csi_relationship: |
  * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
  * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
  * virtual instances
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-ppc64-stg
+++ b/inventory/group_vars/buildvm-ppc64-stg
@ -45,7 +45,3 @@ source_registry: "registry.stg.fedoraproject.org"
 docker_registry: "candidate-registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-ppc64le
+++ b/inventory/group_vars/buildvm-ppc64le
@ -41,7 +41,3 @@ csi_relationship: |
  * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
  * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
  * virtual instances
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-ppc64le-stg
+++ b/inventory/group_vars/buildvm-ppc64le-stg
@ -45,7 +45,3 @@ source_registry: "registry.stg.fedoraproject.org"
 docker_registry: "candidate-registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-s390
+++ b/inventory/group_vars/buildvm-s390
@ -15,7 +15,3 @@ docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-s390x
+++ b/inventory/group_vars/buildvm-s390x
@ -18,7 +18,3 @@ csi_relationship: |
  * Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
  * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
  * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@ -45,7 +45,3 @@ source_registry: "registry.stg.fedoraproject.org"
 docker_registry: "candidate-registry.stg.fedoraproject.org"
 koji_root: "koji.stg.fedoraproject.org/koji"
 koji_hub: "koji.stg.fedoraproject.org/kojihub"
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false
--- a/inventory/group_vars/buildvmhost
+++ b/inventory/group_vars/buildvmhost
@ -15,7 +15,3 @@ csi_relationship: |
    * Relies on ansible, virthost, and is monitored by nagios
    * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
    * Builder vm's are hosted on hosts created with this playbook.
-
-# nagios items
-nagios_Check_Services:
-  nrpe: false