Cleanups:

* Remove old commented out code
* Remove superfluous test for presence of file on disk

refs #4887

diff --git a/services/api/app/models/node.rb b/services/api/app/models/node.rb
index ab8b1974bc13db3e70be6187fc7c284c4e8a6c1f..502ae26594042f8e56973897e1d5d093f2d05990 100644 (file)
--- a/services/api/app/models/node.rb
+++ b/services/api/app/models/node.rb
@@ -166,10 +166,6 @@ class Node < ArvadosModel
       STDERR.puts "Unable to write #{hostfile}: #{e.message}"
       return
     end
-    #  f.puts "address=/#{hostname}/#{ip_address}"
-    #  f.puts "address=/#{hostname}.#{@@domain}/#{ip_address}" if @@domain
-    #  f.puts "ptr-record=#{ptr_domain},#{hostname}"
-    #end
     File.open(File.join(@@dns_server_conf_dir, 'restart.txt'), 'w') do |f|
       # this will trigger a dns server restart
       f.puts @@dns_server_reload_command
@@ -182,8 +178,7 @@ class Node < ArvadosModel
 
   # At startup, make sure all DNS entries exist.  Otherwise, slurmctld
   # will refuse to start.
-  if @@dns_server_conf_dir and @@dns_server_conf_template and
-      !File.exists? (File.join(@@dns_server_conf_dir, "#{hostname_for_slot(MAX_SLOTS-1)}.conf"))
+  if @@dns_server_conf_dir and @@dns_server_conf_template
     (0..MAX_SLOTS-1).each do |slot_number|
       hostname = hostname_for_slot(slot_number)
       hostfile = File.join @@dns_server_conf_dir, "#{hostname}.conf"