summaryrefslogtreecommitdiffstats
path: root/setup
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2020-08-20 04:02:45 +0200
committerSuren A. Chilingaryan <csa@suren.me>2020-08-20 04:02:45 +0200
commit430b52b32bb44e05516b0178501cf2878909aaec (patch)
treebf3e01323b69cf465c48c3242083422e08193c57 /setup
parent5de35a8ae4e76f283abf159f84bfa9c9b17efddb (diff)
downloadands-430b52b32bb44e05516b0178501cf2878909aaec.tar.gz
ands-430b52b32bb44e05516b0178501cf2878909aaec.tar.bz2
ands-430b52b32bb44e05516b0178501cf2878909aaec.tar.xz
ands-430b52b32bb44e05516b0178501cf2878909aaec.zip
EPICS namespace and documetation update
Diffstat (limited to 'setup')
-rw-r--r--setup/configs/openshift.yml19
-rw-r--r--setup/configs/secrets.yml19
-rw-r--r--setup/configs/security.yml1
-rw-r--r--setup/external_ip.txt8
-rw-r--r--setup/users/htpasswd2
5 files changed, 33 insertions, 16 deletions
diff --git a/setup/configs/openshift.yml b/setup/configs/openshift.yml
index fc1743a..878d687 100644
--- a/setup/configs/openshift.yml
+++ b/setup/configs/openshift.yml
@@ -8,6 +8,7 @@ ands_openshift_projects:
kaas: KaaS router and common resources
katrin: KArlsruhe TRItium Neutrino
status: KATRIN status display
+ epics: EPICS control system
adei: ADEI
adai: ADAI
bora: Build Once Run Always
@@ -24,6 +25,9 @@ ands_openshift_users:
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" }
+ jalal: { name: "Jalal Mostafa", email: "jalal.mostapha@outlook.com" }
+ gil: { name: "Woosik Gil", email: "gil@kit.edu" }
+
ands_openshift_roles:
cluster-admin: csa
@@ -31,14 +35,15 @@ ands_openshift_roles:
katrin/admin: katrin
status/admin: katrin
adei/admin: csa
- adei/view: pdv, kopmann
- adei/kaas-maintain: pdv, kopmann
- adai/admin: csa, kopmann
- bora/admin: csa, ntj, katrin, kopmann
+ adei/view: pdv, kopmann, jalal
+ adei/kaas-maintain: pdv, kopmann, jalal
+ adai/admin: csa, kopmann, jalal
+ bora/admin: csa, ntj, gil, jalal, katrin, kopmann
+ epics/admin: csa, jalal
wave/admin: csa, ntj
- services/admin: csa
- web/admin: kopmann, jonasteufel
- mon/admin: csa
+ services/admin: csa, jalal, katrin
+ web/admin: kopmann, jonasteufel, jalal
+ mon/admin: csa, jalal
test/admin: csa, ntj, kopmann, katrin
ands_repos:
diff --git a/setup/configs/secrets.yml b/setup/configs/secrets.yml
index 5005be0..0d04ece 100644
--- a/setup/configs/secrets.yml
+++ b/setup/configs/secrets.yml
@@ -1,10 +1,11 @@
$ANSIBLE_VAULT;1.1;AES256
-30383738386265633133306363326639656331333736303966633133333661383561373533303966
-6361396564626437656237663035616461656661316265610a306336373231616136393330616632
-39376265346133303332363235303635383239336463633234616261643161643639313732313536
-3264636131353136640a623238663037336261303063313564303665386561643030373064356536
-61633136393138656533336563346635656531376161376639656436343437326538366336643734
-35363464646131316366626234613737366633626166376339313832646239626265333637613261
-32353535356537323533373831396138326239643937623865613731373165393633626331623839
-66323039393136313431383264633731653965386261613336376263396531333862306562313337
-38346465613831613566353233346634373032663537353633643330363136343264
+65363962636236613634613837653134633264656465386635633664366365316666393163646130
+3566376130643337626562393361646565396465396661300a333031313732373061393036616366
+62633866616631316261373135666164356161303332613862643132333230376532356237393539
+3263663537613631350a633965366532333361613164346162626138336565303935393862633933
+32653639336436623563666438343230376563643730636635653239393034393663383333643032
+63363330356165666266623463666137393861643930366632373763613236633661643166633439
+30633638393864343430366538343933333039366565326231633233643263383832356361633439
+62666661643963346431643138663538313761316639623065333437386463313231626532323561
+66616531346566366663393632643533636236633464353162613965316634666535313530623337
+3435386536643263316131303736396238366630393037346664
diff --git a/setup/configs/security.yml b/setup/configs/security.yml
index a35b33e..171fdf6 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"
status: "5100/10"
+ epics: "5200/10"
adei: "6000/10"
adai: "6050/10"
bora: "6100/10"
diff --git a/setup/external_ip.txt b/setup/external_ip.txt
new file mode 100644
index 0000000..e9e6826
--- /dev/null
+++ b/setup/external_ip.txt
@@ -0,0 +1,8 @@
+External networks, ranges 192.168.128.x - 192.168.191.x
+=================
+ - 192.168.128.0/24 KaaS VMs (reserved, unused)
+ - 192.168.129.0/24 ADEI VMs (reserved, unused)
+ - 192.168.130.0/24 EPICS VMs (managed by Jalal)
+
+
+ \ No newline at end of file
diff --git a/setup/users/htpasswd b/setup/users/htpasswd
index 8965caf..4386b9e 100644
--- a/setup/users/htpasswd
+++ b/setup/users/htpasswd
@@ -4,3 +4,5 @@ katrin:$apr1$94lAgTxt$LVOWdwye92nsZVqVT7VaG1
ntj:$apr1$G5/ThWdp$kFLsj/hO9jIYYP.Zab9kC/
kopmann:$apr1$jU8jCdPh$u7ZUBiT3gzxlf1xPJl6FI.
jonasteufel:$apr1$2dsiiZ1p$Us/5i8DEt9fxeliGy7L6h/
+jalal:$apr1$hwKRrL2x$RbtSQbfZZqPuvHL9YhCKp.
+gil:$apr1$p2khs49v$7poH4dUbTpCyhEO5JmgLx0