Salt installer fixes:

* documentation: fix formatting
* multi-host aws example: remove AccessViaHosts from the config file, it
  is not necessary. Fix volume identifiers. Fix link to documentation by
  dispatcher key.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index e497240c4c20ea27a06d4e522b7d2ab033f102a8..83a60c9fee365a67b20c5c3b41c42a6e0857f7c2 100644 (file)
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -111,9 +111,9 @@ h2(#installation_order). Installation order
 
 A few Arvados nodes need to be installed in certain order. The required order is
 
-#. Database
-#. API server
-#. The other nodes can be installed in any order after the two above
+* Database
+* API server
+* The other nodes can be installed in any order after the two above
 
 h2(#run_provision_script). Run the provision.sh script
 
@@ -137,42 +137,42 @@ arvados: Failed:      0
 
 The distribution of role as described above can be applied running these commands:
 
-#. Database
+h4. Database
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
 ssh user@host sudo ./provision.sh --config local.params --roles database
 </code></pre>
 </notextile>
 
-#. API
+h4. API
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
 ssh user@host sudo ./provision.sh --config local.params --roles api,controller,websocket,dispatcher
 </code></pre>
 </notextile>
 
-#. Keepstore/s
+h4. Keepstore(s)
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
 ssh user@host sudo ./provision.sh --config local.params --roles keepstore
 </code></pre>
 </notextile>
 
-#. Workbench
+h4. Workbench
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
 ssh user@host sudo ./provision.sh --config local.params --roles workbench,workbench2,webshell
 </code></pre>
 </notextile>
 
-#. Keepproxy / Keepweb
+h4. Keepproxy / Keepweb
 <notextile>
 <pre><code>scp -r provision.sh local* user@host:
 ssh user@host sudo ./provision.sh --config local.params --roles keepproxy,keepweb
 </code></pre>
 </notextile>
 
-#. Shell (here we copy the CLI test workflow too)
+h4. Shell (here we copy the CLI test workflow too)
 <notextile>
 <pre><code>scp -r provision.sh local* tests user@host:
 ssh user@host sudo ./provision.sh --config local.params --roles shell

diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
index f9cf537fb8e0ed9f902e02dfdcbd2e11001ea10c..f27aa40ac4207b54cdcd2b39a73be342aadcbfe2 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
@@ -118,8 +118,8 @@ arvados:
           SubnetID: subnet-FIXMEFIXMEFIXMEFI
       DispatchPrivateKey: |
         -----BEGIN OPENSSH PRIVATE KEY-----
-        Read https://doc.arvados.org/v2.0/install/install-dispatch-cloud.html
-        for details on how to create it and where to place the key
+        Read https://doc.arvados.org/install/crunch2-cloud/install-compute-node.html#sshkeypair
+        for details on how to create this key.
         FIXMEFIXMEFIXMEFI
         -----END OPENSSH PRIVATE KEY-----
 
@@ -128,24 +128,18 @@ arvados:
     Volumes:
       # the volume name will be composed with
       # <cluster>-nyw5e-<volume>
-      __CLUSTER__-nyw5e-0000000000000000:
-        AccessViaHosts:
-          'http://__KEEPSTORE0_INT_IP__:25107':
-            ReadOnly: false
+      __CLUSTER__-nyw5e-000000000000000:
         Replication: 2
         Driver: S3
         DriverParameters:
-          Bucket: __CLUSTER__-nyw5e-0000000000000000-volume
+          Bucket: __CLUSTER__-nyw5e-000000000000000-volume
           IAMRole: __CLUSTER__-keepstore-00-iam-role
           Region: FIXME
       __CLUSTER__-nyw5e-0000000000000001:
-        AccessViaHosts:
-          'http://__KEEPSTORE1_INT_IP__:25107':
-            ReadOnly: false
         Replication: 2
         Driver: S3
         DriverParameters:
-          Bucket: __CLUSTER__-nyw5e-0000000000000001-volume
+          Bucket: __CLUSTER__-nyw5e-000000000000001-volume
           IAMRole: __CLUSTER__-keepstore-01-iam-role
           Region: FIXME