19215: store keep blocks in /var/lib/arvados/keep instead of /tmp

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/doc/install/index.html.textile.liquid b/doc/install/index.html.textile.liquid
index b37ddc74840cdccbcc27611644742e88b726688d..9b7a533407f61b81b14c72d41ead3695b3aab9e9 100644 (file)
--- a/doc/install/index.html.textile.liquid
+++ b/doc/install/index.html.textile.liquid
@@ -21,12 +21,12 @@ Arvados components can be installed and configured in a number of different ways
 
 <div class="offset1">
 table(table table-bordered table-condensed).
-||_. Setup difficulty|_. Arvados Evaluation|_. Workflow Development|_. Production at Scale|
-|"Arvados-in-a-box":arvbox.html (arvbox)|Easy|yes|limited|no|
-|"Arados Installer":salt-single-host.html (single host)|Easy|yes|limited|no|
-|"Arados Installer":salt-multi-host.html (multi host)|Moderate|yes|yes|yes|
-|"Manual installation":install-manual-prerequisites.html|Difficult|yes|yes|yes|
-|"Cluster Operation Subscription supported by Curii":https://curii.com|N/A ^1^|yes|yes|yes|
+||_. Setup difficulty|_. Arvados Evaluation|_. Development|_. Production Data Management|_. Production Workflows|
+|"Arvados-in-a-box":arvbox.html (arvbox)|Easy|yes|limited|no|no|
+|"Arados Installer":salt-single-host.html (single host)|Easy|yes|limited|limited|limited|
+|"Arados Installer":salt-multi-host.html (multi host)|Moderate|yes|yes|yes|yes|
+|"Manual installation":install-manual-prerequisites.html|Difficult|yes|yes|yes|yes|
+|"Cluster Operation Subscription supported by Curii":https://curii.com|N/A ^1^|yes|yes|yes|yes|
 </div>
 
 ^1^ No user installation necessary.  Curii engineers will install and configure Arvados in your own infrastructure.

diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls
index d11e61bba3683b3da20560a8900764276b870db7..35544730ad633ef8fd209acd77099eefcb421860 100644 (file)
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls
@@ -123,7 +123,7 @@ arvados:
         Replication: 2
         Driver: Directory
         DriverParameters:
-          Root: /tmp
+          Root: /var/lib/arvados/keep
 
     Users:
       NewUsersAreActive: true

diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/keep_volume.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/keep_volume.sls
new file mode 100644 (file)
index 0000000..9af20eb
--- /dev/null
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/keep_volume.sls
@@ -0,0 +1,10 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+/var/lib/arvados/keep:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: '0770'
+    - makedirs: True

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
index ec51fe59080a520a24bc21e7fa8247f1cc1ebfd5..fc5b5a57561f06183ced2b63e801507bca281f41 100644 (file)
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
@@ -123,7 +123,7 @@ arvados:
         Replication: 2
         Driver: Directory
         DriverParameters:
-          Root: /tmp
+          Root: /var/lib/arvados/keep
 
     Containers:
       LocalKeepBlobBuffersPerVCPU: 0

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/keep_volume.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/keep_volume.sls
new file mode 100644 (file)
index 0000000..9af20eb
--- /dev/null
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/keep_volume.sls
@@ -0,0 +1,10 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+/var/lib/arvados/keep:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: '0770'
+    - makedirs: True