First running prototype

3 files changed, 37 insertions, 18 deletions

diff --git a/setup/configs/openshift.yml b/setup/configs/openshift.yml
index 17351ac..e6e4c75 100644
--- a/setup/configs/openshift.yml
+++ b/setup/configs/openshift.yml
@@ -1,15 +1,26 @@
 ---
 ands_openshift_projects:
-    adei: ADEI
-
-#    katrin: KArlsruhe TRItium Neutrino
-#    test: Tesing    
+  kaas: KaaS router and common resources
+  katrin: KArlsruhe TRItium Neutrino
+  adei: ADEI
+  bora: Build Once Run Always
+  web: Web Sites
+  mon: OpenShift monitoring
+  test: Namespace for testing and prototyping
 
 ands_openshift_users:
   pdv: IPE Administation Account
   katrin: KATRIN Project
   csa: Suren A. Chilingaryan <csa@suren.me>
+  kopmann: Andreas Kopmann <kopmann@kit.edu>
+  ntj: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
 
 ands_openshift_roles:
-  cluster-admin: csa, pdv
+  cluster-admin: csa
+  kaas/admin: csa, kopmann
   katrin/admin: katrin
+  adei/admin: csa
+  bora/admin: ntj
+  web/admin: kopmann
+  mon/admin: csa
+  test/admin: csa, ntj, kopmann, katrin
diff --git a/setup/configs/security.yml b/setup/configs/security.yml
index 413f57e..b870c55 100644
--- a/setup/configs/security.yml
+++ b/setup/configs/security.yml
@@ -1,6 +1,6 @@
 ands_openshift_gid_mode:
-#    adei: "RunAsAny"
     ands_default: "MustRunAs"
+#    sample: "RunAsAny"
 
 #ands_openshift_uid_mode:
 #    ands_default: "MustRunAsRange"
@@ -8,8 +8,13 @@ ands_openshift_gid_mode:
 #ands_openshift_uid_ranges:
 
 ands_openshift_gid_ranges:
+  kaas:   "4000/10"
   katrin: "5000/10"
-  adei: "5010/10"
+  test:   "7100/10"
+  adei:   "6000/10"
+  bora:   "6100/10"
+  web:    "6200/10"
+  mon:    "7000/10"
 
 ands_openshift_uids:
   kaas: { id: 6000 }
diff --git a/setup/configs/volumes.yml b/setup/configs/volumes.yml
index d93f177..f400eed 100644
--- a/setup/configs/volumes.yml
+++ b/setup/configs/volumes.yml
@@ -4,6 +4,7 @@ ands_paths:
   openshift: /mnt/openshift
   temporary: /mnt/temporary
   databases: /mnt/databases
+  datastore: /mnt/datastore
   katrin_data: /mnt/katrin
 
 ands_heketi_domain:
@@ -15,10 +16,11 @@ ands_storage_domains:
   - servers: "ands_storage_servers"
     clients: "masters"
     volumes:
-      provision: { type: "cfg", mount: "{{ ands_paths.provision }}" }
-      openshift: { type: "cfg", mount: "{{ ands_paths.openshift }}" }
-      databases: { type: "db",  mount: "{{ ands_paths.databases }}" }
-      temporary: { type: "tmp", mount: "{{ ands_paths.temporary }}" }
+      provision: { type: "cfg",  mount: "{{ ands_paths.provision }}" }
+      openshift: { type: "cfg",  mount: "{{ ands_paths.openshift }}" }
+      databases: { type: "db",   mount: "{{ ands_paths.databases }}" }
+      temporary: { type: "tmp",  mount: "{{ ands_paths.temporary }}" }
+      datastore: { type: "data", mount: "{{ ands_paths.datastore }}" }
       katrin_data: { type: "data", mount: "{{ ands_paths.katrin_data }}" }
 #  - servers: "storage_nodes"
 #    clients: "nodes"
@@ -30,13 +32,14 @@ ands_storage_domains:
 
 
 # Per project list (to distribute in multiple namespaces later)
+# If not started with '/' will be prepended with project name
 ands_openshift_volumes:
-  etc: { volume: "openshift", path: "/etc" }
-  src: { volume: "openshift", path: "/src" }
-  www: { volume: "openshift", path: "/www" }
-  log: { volume: "temporary", path: "/log", write: true}
-  tmp: { volume: "temporary", path: "/tmp", write: true}
+  etc:  { volume: "openshift", path: "" }
+  etcw: { volume: "openshift", path: "", write: true }
+  data: { volume: "datastore", path: "", write: true }
+  db:   { volume: "databases", path: "", write: true }
+  tmp:  { volume: "temporary", path: "", write: true }
 
 # Global list, we only take things from the volume of project
-ands_openshift_files:
-  - { osv: "log", path: "apache2-kaas", state: "directory", mode: "0777" }
+#ands_openshift_files:
+#  - { osv: "log", path: "apache2-kaas", state: "directory", mode: "0777" }