4 files changed, 11 insertions, 51 deletions
diff --git a/setup/projects/katrin/vars/globals.yml b/setup/projects/katrin/vars/globals.yml
deleted file mode 100644
index 50776ff..0000000
--- a/setup/projects/katrin/vars/globals.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-#katrin_node: katrin.kit.edu
-katrin_node: "katrin.{{ openshift_master_default_subdomain }}"
diff --git a/setup/projects/katrin/vars/katrin.yml b/setup/projects/katrin/vars/katrin.yml
deleted file mode 100644
index c825654..0000000
--- a/setup/projects/katrin/vars/katrin.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-#katrin_openshift_volumes:
-#adei_openshift_volumes:
-
-#volumes: "{{ ands_openshift_volumes | combine (katrin_openshift_volumes, adei_openshift_volumes) }}"
-#files: "{{ ands_openshift_files | union([]) }}"
-#file_owner: katrin
-#file_group: katrin
-\ No newline at end of file
diff --git a/setup/projects/katrin/vars/pods.yml b/setup/projects/katrin/vars/pods.yml
deleted file mode 100644
index 1334242..0000000
--- a/setup/projects/katrin/vars/pods.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# First port is exposed
-
-pods:
-  kaas:
-    variant: "{{ ands_prefer_docker | default(false) | ternary('docker', 'centos') }}"
-    centos:
-      service: { host: "{{ katrin_node }}", ports: [ 80/8080, 443/8043 ] }
-      sched: { replicas: 1, selector: { master: 1 } }
-      selector: { master: 1 }
-      images:
-        - image: "centos/httpd-24-centos7"
-          mappings: 
-            - { name: "etc", path: "apache2-kaas-centos", mount: "/etc/httpd" }
-            - { name: "www", path: "kaas", mount: "/opt/rh/httpd24/root/var/www/html" }
-            - { name: "log", path: "apache2-kaas", mount: "/var/log/httpd24" }
-          probes:
-            - { port: 8080, path: '/index.html' }
-    docker:
-      service: { host: "{{ katrin_node }}", ports: [ 80/8080, 443/8043 ] }
-      sched: { replicas: 1, selector: { master: 1 } }
-      selector: { master: 1 }
-      images:
-        - image: "httpd:2.2"
-          mappings: 
-            - { name: "etc", path: "apache2-kaas-docker", mount: "/usr/local/apache2/conf" }
-            - { name: "www", path: "kaas", mount: "/usr/local/apache2/htdocs" }
-            - { name: "log", path: "apache2-kaas", mount: "/usr/local/apache2/logs" }
-          probes:
-            - { port: 8080, path: '/index.html' }
-
-#pods:
-#    kaas: "{{ kaas_project_config.pod_variants[ ands_prefer_docker | default(false) | ternary(1, 0) ] }}"
-
-
-
-#oc:
-#  - template: "[0-3]*"
-#  - template: "[4-6]*"
-#  - resource: "route/apache" 
-#    oc: "expose svc/kaas --name apache --hostname=apache.{{ openshift_master_default_subdomain }}"
-#  - template: "*"
-  
-\ No newline at end of file
diff --git a/setup/projects/katrin/vars/volumes.yml b/setup/projects/katrin/vars/volumes.yml
new file mode 100644
index 0000000..ca22a28
--- /dev/null
+++ b/setup/projects/katrin/vars/volumes.yml
@@ -0,0 +1,11 @@
+gids:
+  katrin: { id: 5000 }
+
+extra_volumes:
+  katrin:  { volume: "katrin_data", path: "/", capacity: "40Ti", write: true }
+
+files:
+  - { osv: "katrin", path: "/", state: "directory", group: "katrin", mode: "0775" }
+
+#resync: true
+#sync_set_gid: katrin