From 2c3f1522274c09f7cfdb6309adc0719f05c188e9 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Thu, 5 Jul 2018 06:29:09 +0200
Subject: Update monitoring scripts to track leftover OpenVSwitch 'veth'
 interfaces and clean them up pereodically to avoid performance degradation,
 split kickstart

---
 setup/configs/openshift.yml | 5 ++++-
 setup/configs/security.yml  | 1 +
 setup/users/htpasswd        | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'setup')

diff --git a/setup/configs/openshift.yml b/setup/configs/openshift.yml
index a4024ae..5637269 100644
--- a/setup/configs/openshift.yml
+++ b/setup/configs/openshift.yml
@@ -3,6 +3,7 @@ ands_openshift_projects:
   kaas: KaaS router and common resources
   katrin: KArlsruhe TRItium Neutrino
   adei: ADEI
+  adai: ADAI
   bora: Build Once Run Always
   web: Web Sites
   mon: OpenShift monitoring
@@ -14,6 +15,7 @@ ands_openshift_users:
   csa: { name: "Suren A. Chilingaryan", email: "csa@suren.me", uid: "1001", shell: "/bin/bash" }
   kopmann: { name: "Andreas Kopmann", email: "kopmann@kit.edu" }
   ntj: { name: "Nicholas Tan Jerome", email: "nicholas.jerome@kit.edu" }
+  jonasteufel: { name: "Jonas Teufel", email: "jonseb1998@gmail.com" }
 
 ands_openshift_roles:
   cluster-admin: csa
@@ -22,7 +24,8 @@ ands_openshift_roles:
   adei/admin: csa
   adei/view: pdv, kopmann
   adei/kaas-maintain: pdv, kopmann
+  adai/admin: csa
   bora/admin: ntj
-  web/admin: kopmann
+  web/admin: kopmann, jonasteufel
   mon/admin: csa
   test/admin: csa, ntj, kopmann, katrin
diff --git a/setup/configs/security.yml b/setup/configs/security.yml
index 22784b3..8e418f9 100644
--- a/setup/configs/security.yml
+++ b/setup/configs/security.yml
@@ -20,6 +20,7 @@ ands_openshift_gid_ranges:
   kaas:   "4000/10"
   katrin: "5000/10"
   adei:   "6000/10"
+  adai:   "6050/10"
   bora:   "6100/10"
   web:    "6200/10"
   mon:    "7000/10"
diff --git a/setup/users/htpasswd b/setup/users/htpasswd
index cf0f1e6..b7165a4 100644
--- a/setup/users/htpasswd
+++ b/setup/users/htpasswd
@@ -1,5 +1,6 @@
 pdv:$apr1$ACvj6uUa$Nm1Vq8hZq3RzTtaYpAHv01
 csa:$apr1$IqEwdnzy$UAdd8ZSFnXommBbj29w3c0
-katrin:$apr1$/hxgbxC4$/MxeHtIYvAJcIQFR5Jz0E0
-ntj:$apr1$un8GkxMv$VZ36KeB90qwMMVpvHxOj8.
+katrin:$apr1$AQIm74Ae$CJWEzUK6jEYSsk28DQ9du0
+ntj:$apr1$G5/ThWdp$kFLsj/hO9jIYYP.Zab9kC/
 kopmann:CZFk3ASLX0Vq6
+jonasteufel:$apr1$2dsiiZ1p$Us/5i8DEt9fxeliGy7L6h/
-- 
cgit v1.2.3