add resolv class for grnet

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 092f3212448d2953d8fbc53c4824cb31b6bb7df9..64b54d2dddfcd019585ee20b9bf074f11bac1e58 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -81,6 +81,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt", "ftcollins":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index eb59db861f7c98072bdabdc8fe176dd7959aed11..41e029d8cbabc313082f9a60647abe9d374666d6 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -9,9 +9,6 @@ searchpaths = []
 resolvconf  = ''
 
 case hoster
-  when "ubcece" then
-    searchpaths << "debprivate-ubc.debian.org"
-    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
   when "darmstadt" then
     case hostname
       when "draghi", "liszt" then
@@ -26,6 +23,12 @@ case hoster
     end
     nameservers += ["192.25.206.33", "192.25.206.57"]
     searchpaths << "debprivate-ftcollins.debian.org"
+  when "grnet" then
+    nameservers += ["194.177.210.10", "194.177.210.210"]
+    searchpaths += "debprivate-grnet.debian.org"
+  when "ubcece" then
+    searchpaths << "debprivate-ubc.debian.org"
+    nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
 end
 
 searchpaths << "debian.org"