improve default nameservers list

diff --git a/app/models/node.rb b/app/models/node.rb
index d483b3b1ff38857f8cb6bc54697845a6fe7ab8f6..e8daca6f7e328284558d7a00395f3c3bde8dab1b 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -16,12 +16,7 @@ class Node < ActiveRecord::Base
                 nil
               end
   @@domain = Rails.configuration.compute_node_domain rescue `hostname --domain`.strip
-  @@nameservers = begin
-                    Rails.configuration.compute_node_nameservers
-                  rescue
-                    [Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/local-ipv4')).
-                     match(/^[\d\.]+$/)[0]]
-                  end
+  @@nameservers = Rails.configuration.compute_node_nameservers
 
   api_accessible :superuser, :extend => :common do |t|
     t.add :hostname

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 5c59d006bb7839598d1a82e8bcbc3a0e11a21f65..1f469176293f12083e58dfbaf4d086c6fdfe6566 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -34,6 +34,6 @@ Server::Application.configure do
 
   # config.compute_node_domain = `hostname --domain`.strip
 
-  # config.compute_node_nameservers = [Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/local-ipv4')).match(/^[\d\.]+$/)[0]]
+  # config.compute_node_nameservers = ['1.2.3.4', '1.2.3.5']
   config.compute_node_nameservers = ['192.168.201.3']
 end

diff --git a/config/environments/production.rb b/config/environments/production.rb
index d115fa88fdd1e272cc7e0254108f046dfcce0116..7069e2bb009b7396946ffdbd28264610abe18573 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -62,5 +62,8 @@ Server::Application.configure do
 
   # config.compute_node_domain = `hostname --domain`.strip
 
-  # config.compute_node_nameservers = [Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/local-ipv4')).match(/^[\d\.]+$/)[0]]
+  # config.compute_node_nameservers = ['1.2.3.4', '1.2.3.5']
+  config.compute_node_nameservers = ['local', 'public'].collect do |iface|
+    Net::HTTP.get(URI("http://169.254.169.254/latest/meta-data/#{iface}-ipv4")).match(/^[\d\.]+$/)[0]
+  end << '172.16.0.23'
 end

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 029588c0f8f01d85dc55e3faca906a439857b85e..8adf0e68089b375083dfeb283fcfd9499e175f20 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -41,5 +41,8 @@ Server::Application.configure do
 
   # config.compute_node_domain = `hostname --domain`.strip
 
-  # config.compute_node_nameservers = [Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/local-ipv4')).match(/^[\d\.]+$/)[0]]
+  # config.compute_node_nameservers = ['1.2.3.4', '1.2.3.5']
+  config.compute_node_nameservers = ['local', 'public'].collect do |iface|
+    Net::HTTP.get(URI("http://169.254.169.254/latest/meta-data/#{iface}-ipv4")).match(/^[\d\.]+$/)[0]
+  end << '172.16.0.23'
 end