From a8e58addc9d747f7513f3e2ec2bc6a9656150375 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 1 May 2017 21:28:28 +0000 Subject: [PATCH] try moving this up a level to the overriding group --- inventory/group_vars/buildaarch64 | 4 ---- inventory/group_vars/buildarm | 4 ---- inventory/group_vars/buildarm-stg | 4 ---- inventory/group_vars/builders | 5 +++++ inventory/group_vars/builders-stg | 5 +++++ inventory/group_vars/buildhw | 4 ---- inventory/group_vars/buildppc | 4 ---- inventory/group_vars/buildppcle | 4 ---- inventory/group_vars/buildvm | 4 ---- inventory/group_vars/buildvm-aarch64 | 4 ---- inventory/group_vars/buildvm-aarch64-stg | 4 ---- inventory/group_vars/buildvm-armv7 | 4 ---- inventory/group_vars/buildvm-armv7-stg | 4 ---- inventory/group_vars/buildvm-ppc64 | 4 ---- inventory/group_vars/buildvm-ppc64-stg | 4 ---- inventory/group_vars/buildvm-ppc64le | 4 ---- inventory/group_vars/buildvm-ppc64le-stg | 4 ---- inventory/group_vars/buildvm-s390 | 4 ---- inventory/group_vars/buildvm-s390x | 4 ---- inventory/group_vars/buildvm-stg | 4 ---- inventory/group_vars/buildvmhost | 4 ---- 21 files changed, 10 insertions(+), 76 deletions(-) create mode 100644 inventory/group_vars/builders create mode 100644 inventory/group_vars/builders-stg diff --git a/inventory/group_vars/buildaarch64 b/inventory/group_vars/buildaarch64 index b088b42b2b..a878d1e3f8 100644 --- 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 diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm index 6fc1915166..90cca8227c 100644 --- 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 diff --git a/inventory/group_vars/buildarm-stg b/inventory/group_vars/buildarm-stg index 55cd57512f..cc6d1b36c3 100644 --- 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 diff --git a/inventory/group_vars/builders b/inventory/group_vars/builders new file mode 100644 index 0000000000..8fea99e0f7 --- /dev/null +++ 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 diff --git a/inventory/group_vars/builders-stg b/inventory/group_vars/builders-stg new file mode 100644 index 0000000000..8fea99e0f7 --- /dev/null +++ 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 diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw index d5d2ffe3e8..546089d05b 100644 --- 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 diff --git a/inventory/group_vars/buildppc b/inventory/group_vars/buildppc index 55bf284db5..711b66838a 100644 --- 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 diff --git a/inventory/group_vars/buildppcle b/inventory/group_vars/buildppcle index fe594bafff..2067d3372f 100644 --- 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 diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm index 970595d33d..e5a7040b6d 100644 --- 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 diff --git a/inventory/group_vars/buildvm-aarch64 b/inventory/group_vars/buildvm-aarch64 index 9aee5cc799..4556a6a9e5 100644 --- 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 diff --git a/inventory/group_vars/buildvm-aarch64-stg b/inventory/group_vars/buildvm-aarch64-stg index 5d46947fc1..9e0fef4402 100644 --- 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 diff --git a/inventory/group_vars/buildvm-armv7 b/inventory/group_vars/buildvm-armv7 index 333f86cdc7..3f6258ee90 100644 --- 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 diff --git a/inventory/group_vars/buildvm-armv7-stg b/inventory/group_vars/buildvm-armv7-stg index 5d46947fc1..9e0fef4402 100644 --- 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 diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64 index bc08714bb1..b5f7d78ed6 100644 --- 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 diff --git a/inventory/group_vars/buildvm-ppc64-stg b/inventory/group_vars/buildvm-ppc64-stg index 5d46947fc1..9e0fef4402 100644 --- 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 diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le index 02475b6b38..874daf2f32 100644 --- 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 diff --git a/inventory/group_vars/buildvm-ppc64le-stg b/inventory/group_vars/buildvm-ppc64le-stg index 5d46947fc1..9e0fef4402 100644 --- 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 diff --git a/inventory/group_vars/buildvm-s390 b/inventory/group_vars/buildvm-s390 index e628c5ba51..d567561ad9 100644 --- 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 diff --git a/inventory/group_vars/buildvm-s390x b/inventory/group_vars/buildvm-s390x index 34fe063e11..3fb8c78533 100644 --- 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 diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg index 5d46947fc1..9e0fef4402 100644 --- 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 diff --git a/inventory/group_vars/buildvmhost b/inventory/group_vars/buildvmhost index c764e2900d..6de2950c1d 100644 --- 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