Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / stormfly-04.rb

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index f280803b9b7e468a094c3dfa4ffc1ce08b98533c..196b54e6fc9260ab5d53e9b0528fb215cccbd8c8 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -8,13 +8,16 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

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

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "140.211.167.100"
+        :address => "140.211.167.100",
+        :bond => {
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

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

         :role => :external,
         :family => :inet6,
         :address => "2605:bc80:3010:700::8cd3:a764"
         :role => :external,
         :family => :inet6,
         :address => "2605:bc80:3010:700::8cd3:a764"


@@ -46,5 +49,6 @@ default_attributes(
 run_list(
   "role[osuosl]",
   "role[hp-g9]",
 run_list(
   "role[osuosl]",
   "role[hp-g9]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )