Merge branch '18663-add-keepbalance-support'

[arvados-formula.git] / arvados / defaults.yaml

diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml
index 38aa764c8dabbe9cdcfa9361469fc268cab5e6c2..4ac246852a6da3779e5dda5db084570879ea5414 100644 (file)
--- a/arvados/defaults.yaml
+++ b/arvados/defaults.yaml
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 ---
 arvados:
   version: 'latest'
@@ -12,6 +15,9 @@ arvados:
   ruby:
     manage_ruby: false
     pkg: ruby
+    use_rvm: false
+    # Only used if using RVM
+    rvm_gemset: arvados
     manage_gems_deps: false
 
     gems_deps:
@@ -36,14 +42,13 @@ arvados:
     user: root
     group: root
     mode: 640
+    check_command: /usr/bin/arvados-server config-check -config
 
   # Experimental feature
   # only available when 'release: development'
   auto_reload_config: false
 
   cluster:
-    force_legacy_api14: false
-
     database:
       connection_pool_max: 32
 
@@ -52,6 +57,8 @@ arvados:
       key: ''
       insecure: false
 
+    resources: {}
+
   ### THESE ARE THE PACKAGES AND DAEMONS BASIC CONFIGS
   ##### API
   api:
@@ -60,6 +67,10 @@ arvados:
     gem:
       name:
         - arvados-cli
+    # Arvados API needs postgresql libs and cli to connect to the database
+    # and populate it. Please specify the postgresql version that you expect
+    # to use here
+    postgresql_version: 12
     service:
       name: nginx
       port: 8004
@@ -67,6 +78,9 @@ arvados:
   controller:
     pkg:
       name: arvados-controller
+    gem:
+      name:
+        - arvados-cli
     service:
       name: arvados-controller
       port: 8003
@@ -78,7 +92,7 @@ arvados:
       # arvados-dispatch-cloud
       # crunch-dispatch-slurm
     service:
-      name: ''
+      name: crunch-dispatch-local
       port: ''
   ##### KEEPPROXY
   keepproxy:
@@ -87,6 +101,13 @@ arvados:
     service:
       name: keepproxy
       port: 25100
+  ##### KEEPBALANCE
+  keepbalance:
+    pkg:
+      name: keep-balance
+    service:
+      name: keep-balance
+      port: 9005
   ##### KEEPWEB
   keepweb:
     pkg:
@@ -119,6 +140,7 @@ arvados:
         - python3-arvados-fuse
         - python3-arvados-python-client
         - python3-arvados-cwl-runner
+        - python3-crunchstat-summary
         - shellinabox
     gem:
       name:
@@ -129,8 +151,6 @@ arvados:
       service:
         name: shellinabox
         port: 4200
-    libpam_arvados:
-      config: /etc/pam.d/arvados
 
   ##### WORKBENCH
   workbench:
@@ -140,6 +160,7 @@ arvados:
       name: nginx
       # just for reference, is where the upstream is configured
       port: 9000
+
   ##### WORKBENCH2
   workbench2:
     pkg: