Merge interface families

[chef.git] / roles / draco.rb

diff --git a/roles/draco.rb b/roles/draco.rb
index dc28adf567738305f74190306875332347eb7c7c..662172a77087d64b2d07857e442159c39372102d 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -4,32 +4,24 @@ description "Master role applied to draco"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0.2801",
+      :internal => {
+        :interface => "enp3s0f0.2801",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.11"
+        :inet => {
+          :address => "10.0.0.11"
+        }
       },
-      :external_ipv4 => {
-        :interface => "eth0.2800",
+      :external => {
+        :interface => "enp3s0f0.2800",
         :role => :external,
-        :family => :inet,
-        :address => "193.60.236.12"
-      }
-    }
-  },
-  :sysctl => {
-    :tune_cpu_scheduler => {
-      :comment => "Tune CPU scheduler for server scheduling",
-      :parameters => {
-        "kernel.sched_migration_cost" => 50000000,
-        "kernel.sched_autogroup_enabled" => 0
+        :inet => {
+          :address => "193.60.236.12"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[ucl]",
-  "role[hp-g5]"
+  "role[ucl]"
 )