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

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

diff --git a/roles/spike-04.rb b/roles/spike-04.rb
index b0bb7633e49be0cfadc0a139b522f12909d565d6..559abc016ee6e2593f1e012f1caa3ad2ac950968 100644 (file)
--- a/roles/spike-04.rb
+++ b/roles/spike-04.rb
@@ -10,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.21",
         :bond => {
         :family => :inet,
         :address => "10.0.32.21",
         :bond => {

-          :slaves => %w(em1 em2)
+          :slaves => %w[enp3s0f0 enp3s0f1]

         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {


@@ -26,22 +26,13 @@ default_attributes(
         :address => "2001:41c9:2:d6::21"
       }
     }
         :address => "2001:41c9:2:d6::21"
       }
     }

-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    }

   }
 )
 
 run_list(
   "role[bytemark]",
   }
 )
 
 run_list(
   "role[bytemark]",

-  "role[web-frontend]",
-  "role[web-gpximport]",
+  "role[web-frontend]"
+  # "role[web-gpximport]",

   # "role[web-statistics]",
   # "role[web-cleanup]"
 )
   # "role[web-statistics]",
   # "role[web-cleanup]"
 )