From: Lucas Di Pentima <lucas@curoverse.com>
Date: Tue, 22 Nov 2016 16:40:45 +0000 (-0300)
Subject: 5737: Merge branch 'master' into 5737-ruby231
X-Git-Tag: 1.1.0~571^2~9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/09a2e88c51e5432e607f2a38466e55b4ba15e887

5737: Merge branch 'master' into 5737-ruby231
---

09a2e88c51e5432e607f2a38466e55b4ba15e887
diff --cc services/api/app/models/node.rb
index c16e59a73c,e470e4c2bd..1855020466
--- a/services/api/app/models/node.rb
+++ b/services/api/app/models/node.rb
@@@ -226,10 -226,10 +230,10 @@@ class Node < ArvadosMode
      (0..Rails.configuration.max_compute_nodes-1).each do |slot_number|
        hostname = hostname_for_slot(slot_number)
        hostfile = File.join Rails.configuration.dns_server_conf_dir, "#{hostname}.conf"
 -      if !File.exists? hostfile
 +      if !File.exist? hostfile
          n = Node.where(:slot_number => slot_number).first
          if n.nil? or n.ip_address.nil?
-           dns_server_update(hostname, '127.40.4.0')
+           dns_server_update(hostname, UNUSED_NODE_IP)
          else
            dns_server_update(hostname, n.ip_address)
          end