Merge remote-tracking branch 'github/pull/604'

[chef.git] / roles / grindtooth.rb

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 1a04e42401b33da323be976e5dbb0324de2b80d7..d504a189f10c43e0e0e7bca4a3de5d417b770bf1 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -4,24 +4,25 @@ description "Master role applied to grindtooth"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "em1",
+      :internal => {
+        :interface => "enp3s0f0.2801",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.19"
+        :inet => {
+          :address => "10.0.0.19"
+        }
       },
-      :external_ipv4 => {
-        :interface => "em2",
+      :external => {
+        :interface => "enp3s0f0.2800",
         :role => :external,
-        :family => :inet,
-        :address => "193.60.236.15"
+        :inet => {
+          :address => "193.60.236.15"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-slough]",
-  "role[hp-dl360-g6]",
+  "role[ucl]",
   "role[taginfo]"
 )