feat(resources): add state to register virtual_machines

[arvados-formula.git] / test / salt / pillar / arvados.sls

diff --git a/test/salt/pillar/arvados.sls b/test/salt/pillar/arvados.sls
index f81d2ec72d2ce53d3d28ddba2f6485221b89fdcb..1abe76c2499682c9b8501c25a748aac59bcb71fa 100644 (file)
--- a/test/salt/pillar/arvados.sls
+++ b/test/salt/pillar/arvados.sls
@@ -39,14 +39,13 @@ arvados:
       host: 127.0.0.1
       password: changeme_arvados
       user: arvados
-      encoding: en_US.utf8
-      client_encoding: UTF8
+      extra_conn_params:
+        client_encoding: UTF8
       # Centos7 does not enable SSL by default, so we disable
       # it here just for testing of the formula purposes only.
       # You should not do this in production, and should
       # configure Postgres certificates correctly
       {%- if grains.os_family in ('RedHat',) %}
-      extra_conn_params:
         sslmode: disable
       {%- endif %}
 
@@ -56,26 +55,29 @@ arvados:
       # required to test with snakeoil certs
       insecure: true
 
+    resources:
+      virtual_machines:
+        shell1:
+          name: webshell1
+          backend: 1.2.3.4
+          port: 4200
+        webshell2: {}
+
     ### TOKENS
     tokens:
-      system_root: changemesystemroottoken
-      management: changememanagementtoken
-      rails_secret: changemerailssecrettoken
-      anonymous_user: changemeanonymoususertoken
+      system_root: systemroottokenmushaveatleast32characters
+      management: managementtokenmushaveatleast32characters
+      anonymous_user: anonymoususertokensetinthetokensdict
 
     ### KEYS
     secrets:
-      blob_signing_key: changemeblobsigningkey
-      workbench_secret_key: changemeworkbenchsecretkey
+      blob_signing_key: blobsigningkeymushaveatleast32characters
+      workbench_secret_key: workbenchsecretkeymushaveatleast32characters
       dispatcher_access_key: changemedispatcheraccesskey
       dispatcher_secret_key: changemedispatchersecretkey
       keep_access_key: changemekeepaccesskey
       keep_secret_key: changemekeepsecretkey
 
-    AuditLogs:
-      Section_to_ignore:
-        - some_random_value
-
     ### VOLUMES
     ## This should usually match all your `keepstore` instances
     Volumes:
@@ -100,7 +102,7 @@ arvados:
       Controller:
         ExternalURL: https://fixme.example.net
         InternalURLs:
-          http://127.0.0.2:8003: {}
+          http://controller.internal:8003: {}
       DispatchCloud:
         InternalURLs:
           http://fixme.example.net:9006: {}
@@ -110,17 +112,17 @@ arvados:
       Keepproxy:
         ExternalURL: https://keep.fixme.example.net
         InternalURLs:
-          http://127.0.0.2:25100: {}
+          http://keep.internal:25100: {}
       Keepstore:
         InternalURLs:
           http://keep0.fixme.example.net:25107: {}
       RailsAPI:
         InternalURLs:
-          http://127.0.0.2:8004: {}
+          http://api.internal:8004: {}
       WebDAV:
         ExternalURL: https://collections.fixme.example.net
         InternalURLs:
-          http://127.0.0.2:9002: {}
+          http://collections.internal:9002: {}
       WebDAVDownload:
         ExternalURL: https://download.fixme.example.net
       WebShell:
@@ -128,7 +130,7 @@ arvados:
       Websocket:
         ExternalURL: wss://ws.fixme.example.net/websocket
         InternalURLs:
-          http://127.0.0.2:8005: {}
+          http://ws.internal:8005: {}
       Workbench1:
         ExternalURL: https://workbench.fixme.example.net
       Workbench2: