Merge branch 'master' into 2060-edit-tags-in-workbench

[arvados.git] / services / api / config / environments / test.rb.example

diff --git a/services/api/config/environments/test.rb.example b/services/api/config/environments/test.rb.example
index 5cbf27fa3a7b7b16b7c0c22e1e3dbbbbd6c5fcc7..1782734f83f63d6a25575a119d0bad7142f2270e 100644 (file)
--- a/services/api/config/environments/test.rb.example
+++ b/services/api/config/environments/test.rb.example
@@ -54,6 +54,7 @@ Server::Application.configure do
   # config.compute_node_ami = 'ami-cbca41a2'
   # config.compute_node_ec2run_args = '-g arvados-compute'
   # config.compute_node_spot_bid = 0.11
+  config.compute_node_ec2_tag_enable = false
 
   # config.compute_node_domain = `hostname --domain`.strip
 
@@ -63,7 +64,7 @@ Server::Application.configure do
   # config.compute_node_nameservers = ['1.2.3.4', '1.2.3.5']
   config.compute_node_nameservers = [ "172.16.0.23" ]
 
-  config.uuid_prefix('test@' + `hostname`.strip)
+  config.uuid_prefix = 'zzzzz'
 
   # Authentication stub: hard code pre-approved API tokens.
   # config.accept_api_token = { rand(2**256).to_s(36) => true }
@@ -72,4 +73,7 @@ Server::Application.configure do
   config.new_users_are_active = false
   config.admin_notifier_email_from = 'arvados@example.com'
   config.email_subject_prefix = '[ARVADOS] '
+
+  # Visitors to the API server will be redirected to the workbench
+  config.workbench_address = "http://localhost:3000/"
 end