projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4297-dispatch-load' refs #4297
[arvados.git]
/
services
/
api
/
config
/
application.default.yml
diff --git
a/services/api/config/application.default.yml
b/services/api/config/application.default.yml
index b85df8cb4b21935ca080a447e89e6d3401ecd9e7..6c77f26c9a20e9a254bf9f27f83800f7c594ae62 100644
(file)
--- a/
services/api/config/application.default.yml
+++ b/
services/api/config/application.default.yml
@@
-77,9
+77,6
@@
common:
# crunch-job must be able to stat() it.
crunch_refresh_trigger: /tmp/crunch_refresh_trigger
# crunch-job must be able to stat() it.
crunch_refresh_trigger: /tmp/crunch_refresh_trigger
- # Maximum number of log events that may be generated by a single job.
- crunch_limit_log_events_per_job: 65536
-
# These two settings control how frequently log events are flushed to the
# database. Log lines are buffered until either crunch_log_bytes_per_event
# has been reached or crunch_log_seconds_between_events has elapsed since
# These two settings control how frequently log events are flushed to the
# database. Log lines are buffered until either crunch_log_bytes_per_event
# has been reached or crunch_log_seconds_between_events has elapsed since
@@
-105,15
+102,9
@@
common:
# Path to /etc/dnsmasq.d, or false = do not update dnsmasq data.
dnsmasq_conf_dir: false
# Path to /etc/dnsmasq.d, or false = do not update dnsmasq data.
dnsmasq_conf_dir: false
- # Set to AMI id (ami-123456) to auto-start nodes. See app/models/node.rb
- compute_node_ami: false
- compute_node_ec2run_args: -g arvados-compute
- compute_node_spot_bid: 0.11
-
compute_node_domain: false
compute_node_nameservers:
- 192.168.1.1
compute_node_domain: false
compute_node_nameservers:
- 192.168.1.1
- compute_node_ec2_tag_enable: false
# The version below is suitable for AWS.
# To use it, copy it to your application.yml, uncomment, and change <%# to <%=
# The version below is suitable for AWS.
# To use it, copy it to your application.yml, uncomment, and change <%# to <%=