Make bytemark machines use grisu for DNS

[chef.git] / roles / noquiklos.rb

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index c25793648a3425f62724f3f2478adf2669bfeedf..f42afa81b7b662a270af7af28323a335c3fbf751 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -2,31 +2,26 @@ name "noquiklos"
 description "Master role applied to noquiklos"
 
 default_attributes(
 description "Master role applied to noquiklos"
 
 default_attributes(

-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.13"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.13"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth0.2800",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.201"
+        :address => "193.60.236.16"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ucl-wolfson]",
-  "role[hp-g6]",
+  "role[ucl]",
+  "role[hp-dl360-g6]",

   "role[gps-tile]"
 )
   "role[gps-tile]"
 )