Create common base role for tiamat nodes

diff --git a/roles/supermicro-x8dtt-h.rb b/roles/supermicro-x8dtt-h.rb
new file mode 100644 (file)
index 0000000..84e172e
--- /dev/null
+++ b/roles/supermicro-x8dtt-h.rb
@@ -0,0 +1,8 @@
+name "supermicro-x8dtt-h"
+description "Role applied to all Supermicro X8DTT-H machines"
+
+default_attributes(
+  :hardware => {
+    :watchdog => "w83627hf_wdt"
+  }
+)

diff --git a/roles/tiamat-00.rb b/roles/tiamat-00.rb
index 0deb7ca89f321fedc08651c8d5f1705740f7d7df..0004b9116c7ff463a4e09c887fcf3bb2991c3236 100644 (file)
--- a/roles/tiamat-00.rb
+++ b/roles/tiamat-00.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.40"
       }
     }
         :address => "193.60.236.40"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-01.rb b/roles/tiamat-01.rb
index b2b0eb19d161666fb20a08980be6e5f9e0e76ad2..463381c0cff53cee0874222cd0da854de4f6931e 100644 (file)
--- a/roles/tiamat-01.rb
+++ b/roles/tiamat-01.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.41"
       }
     }
         :address => "193.60.236.41"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-02.rb b/roles/tiamat-02.rb
index de959961ddc8d67857b1826623dca98e059b2a90..d81ada6477ae909dbe7225541a6aa6f14fb061c8 100644 (file)
--- a/roles/tiamat-02.rb
+++ b/roles/tiamat-02.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.42"
       }
     }
         :address => "193.60.236.42"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-03.rb b/roles/tiamat-03.rb
index d550ad4ee0e9e8fee5677c24f98cd67b45e15946..7c31e7ecd149421665af2dba53b9be63c3216b75 100644 (file)
--- a/roles/tiamat-03.rb
+++ b/roles/tiamat-03.rb
@@ -21,5 +21,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-10.rb b/roles/tiamat-10.rb
index a0d1c3994c1a1fa993cc3ed7e6a65ab8a9e622dc..1aa378185263fd3fff21cb29e81caa0d38b9ea92 100644 (file)
--- a/roles/tiamat-10.rb
+++ b/roles/tiamat-10.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.44"
       }
     }
         :address => "193.60.236.44"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-11.rb b/roles/tiamat-11.rb
index dce0c78703772aeb3af227f00958ed6cce9eabd3..2fd7e44a100659af5c07d2a2b5de354cfca20812 100644 (file)
--- a/roles/tiamat-11.rb
+++ b/roles/tiamat-11.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.45"
       }
     }
         :address => "193.60.236.45"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-12.rb b/roles/tiamat-12.rb
index 66145154c898c55ca80fa0b773b2adf9dc0f5a69..661e25a8ccadeb18ab49d44c43368082a4d53cc9 100644 (file)
--- a/roles/tiamat-12.rb
+++ b/roles/tiamat-12.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.46"
       }
     }
         :address => "193.60.236.46"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-13.rb b/roles/tiamat-13.rb
index a7ad81f0c5def4c98c0928224d5a17d0aaa33f66..c75c4ffda2927aeaf0e6ff30e6799793b340e062 100644 (file)
--- a/roles/tiamat-13.rb
+++ b/roles/tiamat-13.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.47"
       }
     }
         :address => "193.60.236.47"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-20.rb b/roles/tiamat-20.rb
index 576d5c8786902b1f7fb804fe0e38ab4d35ad848a..d1369cf1b6abb723c1548a6172e4582a1cf2e744 100644 (file)
--- a/roles/tiamat-20.rb
+++ b/roles/tiamat-20.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.48"
       }
     }
         :address => "193.60.236.48"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-21.rb b/roles/tiamat-21.rb
index 082dd40eff6b369b18bc5d154d55e147c081a144..73b771005fd68d4e5cd569202308ca291d5485ff 100644 (file)
--- a/roles/tiamat-21.rb
+++ b/roles/tiamat-21.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.49"
       }
     }
         :address => "193.60.236.49"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-22.rb b/roles/tiamat-22.rb
index 09f9238ac8da0d0f54395c08f84e7c7e4e7fa6ee..094c8c8e06033249af61d423f5e3cb60fe1f2930 100644 (file)
--- a/roles/tiamat-22.rb
+++ b/roles/tiamat-22.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.50"
       }
     }
         :address => "193.60.236.50"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )

diff --git a/roles/tiamat-23.rb b/roles/tiamat-23.rb
index dacc1ce2ce2fbae5fe0c8dd3d21fb927f5f3597c..e1b0ada833367dd36409ea40a3ac2a52ce9195a3 100644 (file)
--- a/roles/tiamat-23.rb
+++ b/roles/tiamat-23.rb
@@ -17,12 +17,10 @@ default_attributes(
         :address => "193.60.236.51"
       }
     }
         :address => "193.60.236.51"
       }
     }

-  },
-  :hardware => {
-    :watchdog => "w83627hf_wdt"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl]"
+  "role[ucl]",
+  "role[supermicro-x8dtt-h]"

 )
 )