X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5d56a1af42f64df57ef7a1bcef6d016ff2310900..e4aefa613bd4cc313f705560ae4fad25cd806a4b:/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls?ds=sidebyside

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 a7784fd7be..b92c818b89 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
@@ -81,6 +81,13 @@ arvados:
       # required to test with arvados-snakeoil certs
       insecure: false
 
+    resources:
+      virtual_machines:
+        shell:
+          name: shell
+          backend: __SHELL_INT_IP__
+          port: 4200
+
     ### TOKENS
     tokens:
       system_root: __SYSTEM_ROOT_TOKEN__
@@ -106,7 +113,7 @@ arvados:
       CloudVMs:
         ResourceTags:
           Name: __CLUSTER__-compute-node
-        BootProbeCommand: 'sudo docker ps -q'
+        BootProbeCommand: 'systemctl is-system-running'
         ImageID: ami-FIXMEFIXMEFIXMEFI
         Driver: ec2
         DriverParameters:
@@ -118,8 +125,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 +135,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
 
@@ -163,6 +164,9 @@ arvados:
       DispatchCloud:
         InternalURLs:
           'http://__CONTROLLER_INT_IP__:9006': {}
+      Keepbalance:
+        InternalURLs:
+          'http://localhost:9005': {}
       Keepproxy:
         ExternalURL: 'https://keep.__CLUSTER__.__DOMAIN__:__KEEP_EXT_SSL_PORT__'
         InternalURLs: