[ARVADOS] updated: a2de166ab578fcad18a3a27ff58f134af03b8275

[git at public.curoverse.com]

Summary of changes:
 services/api/config/application.default.yml |    2 +-
 services/api/config/application.yml.example |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

       via  a2de166ab578fcad18a3a27ff58f134af03b8275 (commit)
      from  113d3f94224ca507ff6341ab61ac98429cad711e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a2de166ab578fcad18a3a27ff58f134af03b8275
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Mar 14 13:34:29 2014 -0400

    api: Improve compute_node_domain handling.
    
    The default value was causing test failures on my machine because the
    ERB evaluated to an empty string.  And we want to avoid this causing
    any DNS lookups during tests.  Now we make the default false (in line
    with our other compute_node_* settings), and suggest a change in
    application.yml.example to demonstrate how it should be set.
    
    I also fixed up the example about compute_node_nameservers while I was
    at it.
    
    This closes #2351.

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index ad95f04..e46ff5d 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -65,7 +65,7 @@ common:
   compute_node_ec2run_args: -g arvados-compute
   compute_node_spot_bid: 0.11
 
-  compute_node_domain: <%= `hostname`.split('.')[1..-1].join('.').strip %>
+  compute_node_domain: false
   compute_node_nameservers:
     - 192.168.1.1
   compute_node_ec2_tag_enable: false
diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index a9c33a4..488c4bd 100644
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -18,9 +18,14 @@ production:
 
   uuid_prefix: bogus
 
-  # This is suitable for AWS; see common section below for a static example.
+  # compute_node_domain: example.org
+  # compute_node_nameservers:
+  #   - 127.0.0.1
+  #   - 192.168.1.1
   #
-  #compute_node_nameservers: <%#
+  # The version below is suitable for AWS.
+  # Uncomment and change <%# to <%= to use it.
+  # compute_node_nameservers: <%#
     require 'net/http'
     ['local', 'public'].collect do |iface|
       Net::HTTP.get(URI("http://169.254.169.254/latest/meta-data/#{iface}-ipv4")).match(/^[\d\.]+$/)[0]

-----------------------------------------------------------------------


hooks/post-receive
--