From 88c551bcd181fd1c4537d52e6d08c902d8ca46f5 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Fri, 6 Dec 2019 10:16:06 +0100
Subject: Don't provision katrin webdav as there are some modifications by Jan

---
 setup/projects/katrin/vars/apps.yml   |  3 +++
 setup/projects/katrin/vars/pods.yml   | 15 ---------------
 setup/projects/katrin/vars/webdav.yml | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 setup/projects/katrin/vars/apps.yml
 delete mode 100644 setup/projects/katrin/vars/pods.yml
 create mode 100644 setup/projects/katrin/vars/webdav.yml

(limited to 'setup')

diff --git a/setup/projects/katrin/vars/apps.yml b/setup/projects/katrin/vars/apps.yml
new file mode 100644
index 0000000..c5fae0f
--- /dev/null
+++ b/setup/projects/katrin/vars/apps.yml
@@ -0,0 +1,3 @@
+# Webdav volumes (maybe something else) is manually overriden by Katrin team (Jan), so provisioning is disabled.
+#apps:
+#  webdav:               { provision: false, instantiate: false }
diff --git a/setup/projects/katrin/vars/pods.yml b/setup/projects/katrin/vars/pods.yml
deleted file mode 100644
index 0c74816..0000000
--- a/setup/projects/katrin/vars/pods.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-pods:
-  katrin-webdav:
-      service: { host: "katrin-webdav.{{ openshift_master_default_subdomain }}", ports: [ 80/8080 ] }
-      sched: { replicas: 1 }
-      images:
-        - stream: "kaas/kaas-webdav:latest"
-          mappings: 
-            - { name: "katrin",  path: "upload", mount: "/var/dav/data" }
-          env:
-            - { name: "USERNAME", value: "secret@katrin-upload/username" }
-            - { name: "PASSWORD", value: "secret@katrin-upload/password" }
-          probes:
-            - { port: 8080 }
-
-  
\ No newline at end of file
diff --git a/setup/projects/katrin/vars/webdav.yml b/setup/projects/katrin/vars/webdav.yml
new file mode 100644
index 0000000..cb0fcf4
--- /dev/null
+++ b/setup/projects/katrin/vars/webdav.yml
@@ -0,0 +1,16 @@
+webdav:
+  pods:
+    katrin-webdav:
+      service: { host: "katrin-webdav.{{ openshift_master_default_subdomain }}", ports: [ 80/8080 ] }
+      sched: { replicas: 1 }
+      images:
+        - stream: "kaas/kaas-webdav:latest"
+          mappings: 
+            - { name: "katrin",  path: "upload", mount: "/var/dav/data" }
+          env:
+            - { name: "USERNAME", value: "secret@katrin-upload/username" }
+            - { name: "PASSWORD", value: "secret@katrin-upload/password" }
+          probes:
+            - { port: 8080 }
+
+  
\ No newline at end of file
-- 
cgit v1.2.3