From 8054c79719006bf69e060c7a6e6d65c8f72167b5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 28 Feb 2018 22:28:01 +0000
Subject: [PATCH] Rename buildvm-s390x-15 to buildvm-s390x-01.stg

---
 inventory/builders                            |  3 +--
 inventory/group_vars/buildvm-s390x-stg        | 20 +++++++++++++++++++
 inventory/inventory                           |  1 +
 .../files/nagios/services/ping.cfg            |  4 ++--
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 inventory/group_vars/buildvm-s390x-stg

diff --git a/inventory/builders b/inventory/builders
index c41473889e..e080ffb8d6 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -52,7 +52,7 @@ buildvm-aarch64-01.stg.arm.fedoraproject.org
 buildvm-armv7-01.stg.arm.fedoraproject.org
 
 [buildvm-s390x-stg]
-# we don't have s390x staging builders yet
+buildvm-s390x-01.stg.s390.fedoraproject.org
 
 [buildvm-aarch64]
 buildvm-aarch64-01.arm.fedoraproject.org
@@ -124,7 +124,6 @@ buildvm-s390x-11.s390.fedoraproject.org
 buildvm-s390x-12.s390.fedoraproject.org
 buildvm-s390x-13.s390.fedoraproject.org
 buildvm-s390x-14.s390.fedoraproject.org
-buildvm-s390x-15.s390.fedoraproject.org
 
 [buildvmhost]
 buildvmhost-01.phx2.fedoraproject.org
diff --git a/inventory/group_vars/buildvm-s390x-stg b/inventory/group_vars/buildvm-s390x-stg
new file mode 100644
index 0000000000..27c47e0f5e
--- /dev/null
+++ b/inventory/group_vars/buildvm-s390x-stg
@@ -0,0 +1,20 @@
+---
+ansible_ifcfg_blacklist: True
+createrepo: False
+host_group: kojibuilder
+fas_client_groups: sysadmin-releng
+sudoers: "{{ private }}/files/sudo/00releng-sudoers"
+
+koji_hub_nfs: "fedora_koji"
+koji_server_url: "https://koji.stg.fedoraproject.org/kojihub"
+koji_weburl: "https://koji.stg.fedoraproject.org/koji"
+koji_topurl: "https://kojipkgs.stg.fedoraproject.org/"
+
+csi_security_category: High
+csi_primary_contact: Fedora Admins - admin@fedoraproject.org
+csi_purpose: Koji service employs a set of machines to build packages for the Fedora project. This playbook builds vm builders.
+csi_relationship: |
+  * VMs built on top of a s390x LPAR
+  * 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
diff --git a/inventory/inventory b/inventory/inventory
index b7a3c95213..97fe5f4205 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -748,6 +748,7 @@ buildvm-ppc64-01.stg.ppc.fedoraproject.org
 buildvm-ppc64le-01.stg.ppc.fedoraproject.org
 buildvm-aarch64-01.stg.arm.fedoraproject.org
 buildvm-armv7-01.stg.arm.fedoraproject.org
+buildvm-s390x-01.stg.s390.fedoraproject.org
 busgateway01.stg.phx2.fedoraproject.org
 composer.stg.phx2.fedoraproject.org
 copr-be-dev.cloud.fedoraproject.org
diff --git a/roles/nagios_server/files/nagios/services/ping.cfg b/roles/nagios_server/files/nagios/services/ping.cfg
index 6ba317e85d..f1cd372485 100644
--- a/roles/nagios_server/files/nagios/services/ping.cfg
+++ b/roles/nagios_server/files/nagios/services/ping.cfg
@@ -1,12 +1,12 @@
 define service {
-  hostgroup_name		*, !buildvm-armv7, !buildvm-s390x, !buildvm-s390
+  hostgroup_name		*, !buildvm-armv7, !buildvm-s390x, !buildvm-s390x-stg, !buildvm-s390
   service_description		ICMP-Ping4
   check_command			check_ping4!350.0,20%!500.0,60%
   use				criticaltemplate
 }
 
 define service {
-  hostgroup_name		buildvm-armv7, buildvm-s390x, buildvm-s390
+  hostgroup_name		buildvm-armv7, buildvm-s390x, buildvm-s390x-stg, buildvm-s390
   service_description		ICMP-Ping4-vm-builders
   check_command			check_ping4!1500.0,20%!2500.0,80%
   use				criticaltemplate