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

[chef.git] / roles / rhaegal.rb

diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index a16c9e72162fb03ac8e4205c7313e42be3156f98..72d8ae57caa24b12f583c701e805ed08e3a396b0 100644 (file)
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -8,34 +8,20 @@ default_attributes(
     }
   },
   :location => "Zagreb, Croatia",
     }
   },
   :location => "Zagreb, Croatia",

-  :munin => {
-    :plugins => {
-      :sensors_temp => {
-        :temp1 => { :warning => "85.0" },
-        :temp2 => { :warning => "85.0" },
-        :temp3 => { :warning => "85.0" },
-        :temp4 => { :warning => "85.0" },
-        :temp5 => { :warning => "85.0" },
-        :temp6 => { :warning => "85.0" },
-        :temp8 => { :warning => "85.0" },
-        :temp9 => { :warning => "85.0" },
-        :temp10 => { :warning => "85.0" },
-        :temp11 => { :warning => "85.0" },
-        :temp12 => { :warning => "85.0" },
-        :temp13 => { :warning => "85.0" }
-      }
-    }
-  },

   :networking => {
     :interfaces => {
       :external => {
         :interface => "eno1",
         :role => :external,
         :inet => {
   :networking => {
     :interfaces => {
       :external => {
         :interface => "eno1",
         :role => :external,
         :inet => {

-          :address => "10.5.0.77",
-          :prefix => "16",
-          :gateway => "10.5.0.1",
-          :public_address => "161.53.248.77"
+          :address => "193.198.233.218",
+          :prefix => "29",
+          :gateway => "193.198.233.217"
+        },
+        :inet6 => {
+          :address => "2001:b68:40ff:3::2",
+          :prefix => "64",
+          :gateway => "2001:b68:40ff:3::1"

         }
       }
     }
         }
       }
     }