From d4a8e04a536e3f0f00c1ac53442e4c9753fc9079 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 14 Jan 2013 14:51:57 -0800 Subject: [PATCH] improve default nameservers list --- app/models/node.rb | 7 +------ config/environments/development.rb | 2 +- config/environments/production.rb | 5 ++++- config/environments/test.rb | 5 ++++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/models/node.rb b/app/models/node.rb index d483b3b1ff..e8daca6f7e 100644 --- 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 5c59d006bb..1f46917629 100644 --- 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 d115fa88fd..7069e2bb00 100644 --- 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 029588c0f8..8adf0e6808 100644 --- 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 -- 2.30.2