From 337b0ec13142af6885c56b96c985508d3b1ae832 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 11 Oct 2017 09:52:26 +0100 Subject: [PATCH] Create common base role for tiamat nodes --- roles/supermicro-x8dtt-h.rb | 8 ++++++++ roles/tiamat-00.rb | 6 ++---- roles/tiamat-01.rb | 6 ++---- roles/tiamat-02.rb | 6 ++---- roles/tiamat-03.rb | 3 ++- roles/tiamat-10.rb | 6 ++---- roles/tiamat-11.rb | 6 ++---- roles/tiamat-12.rb | 6 ++---- roles/tiamat-13.rb | 6 ++---- roles/tiamat-20.rb | 6 ++---- roles/tiamat-21.rb | 6 ++---- roles/tiamat-22.rb | 6 ++---- roles/tiamat-23.rb | 6 ++---- 13 files changed, 32 insertions(+), 45 deletions(-) create mode 100644 roles/supermicro-x8dtt-h.rb diff --git a/roles/supermicro-x8dtt-h.rb b/roles/supermicro-x8dtt-h.rb new file mode 100644 index 000000000..84e172eb9 --- /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 0deb7ca89..0004b9116 100644 --- a/roles/tiamat-00.rb +++ b/roles/tiamat-00.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.40" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-01.rb b/roles/tiamat-01.rb index b2b0eb19d..463381c0c 100644 --- a/roles/tiamat-01.rb +++ b/roles/tiamat-01.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.41" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-02.rb b/roles/tiamat-02.rb index de959961d..d81ada647 100644 --- a/roles/tiamat-02.rb +++ b/roles/tiamat-02.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.42" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-03.rb b/roles/tiamat-03.rb index d550ad4ee..7c31e7ecd 100644 --- a/roles/tiamat-03.rb +++ b/roles/tiamat-03.rb @@ -21,5 +21,6 @@ default_attributes( ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-10.rb b/roles/tiamat-10.rb index a0d1c3994..1aa378185 100644 --- a/roles/tiamat-10.rb +++ b/roles/tiamat-10.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.44" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-11.rb b/roles/tiamat-11.rb index dce0c7870..2fd7e44a1 100644 --- a/roles/tiamat-11.rb +++ b/roles/tiamat-11.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.45" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-12.rb b/roles/tiamat-12.rb index 66145154c..661e25a8c 100644 --- a/roles/tiamat-12.rb +++ b/roles/tiamat-12.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.46" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-13.rb b/roles/tiamat-13.rb index a7ad81f0c..c75c4ffda 100644 --- a/roles/tiamat-13.rb +++ b/roles/tiamat-13.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.47" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-20.rb b/roles/tiamat-20.rb index 576d5c878..d1369cf1b 100644 --- a/roles/tiamat-20.rb +++ b/roles/tiamat-20.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.48" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-21.rb b/roles/tiamat-21.rb index 082dd40ef..73b771005 100644 --- a/roles/tiamat-21.rb +++ b/roles/tiamat-21.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.49" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-22.rb b/roles/tiamat-22.rb index 09f9238ac..094c8c8e0 100644 --- a/roles/tiamat-22.rb +++ b/roles/tiamat-22.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.50" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) diff --git a/roles/tiamat-23.rb b/roles/tiamat-23.rb index dacc1ce2c..e1b0ada83 100644 --- a/roles/tiamat-23.rb +++ b/roles/tiamat-23.rb @@ -17,12 +17,10 @@ default_attributes( :address => "193.60.236.51" } } - }, - :hardware => { - :watchdog => "w83627hf_wdt" } ) run_list( - "role[ucl]" + "role[ucl]", + "role[supermicro-x8dtt-h]" ) -- 2.43.2