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 0df93a0631a03edc406f708a060e2d281ba20998..6c77f26c9a20e9a254bf9f27f83800f7c594ae62 100644
(file)
--- a/
services/api/config/application.default.yml
+++ b/
services/api/config/application.default.yml
@@
-102,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 <%=