Make prometheus exporters start after the network is available

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 13274b8ff074c7f58400da4467a93c393c6c5df9..b94298604a9ce434a8a908f7ed454fac6ca8af76 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,42 +2,36 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
 description "Master role applied to norbert"
 
 default_attributes(

-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator },
-      :pnorman => { :status => :user }
-    }
-  },
-  :exim => {
-    :aliases => {
-      :root => "yellowbkpk"
-    }
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0",

         :role => :internal,
         :family => :inet,
         :role => :internal,
         :family => :inet,

-        :address => "10.0.0.5"
-      }
-    }
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-       "block/cciss\!c0d0/queue/scheduler" => "noop",
-       "block/cciss\!c0d1/queue/scheduler" => "noop",
-       "block/sda/queue/nr_requests" => "512",
-       "block/sda/queue/scheduler" => "deadline"
+        :address => "10.0.48.17",
+        :bond => {
+          :slaves => %w[enp25s0f0 enp25s0f1]
+        }
+      },
+      :external_ipv4 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet,
+        :address => "130.117.76.17"
+      },
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:11"

       }
       }

+

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[ucl-internal]"
+  "role[equinix-ams]",
+  "role[geodns]",
+  "role[planet]"

 )
 )