Update configuration for move from Imperial to Amsterdam

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

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 97fec5fd2297ac5359b2d1910284a19aefe67af1..05fcf144acd077c04250038911c31d20cb405864 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -5,22 +5,34 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

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

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

-        :address => "146.179.159.162"
+        :address => "10.0.48.6",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }

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

-        :interface => "eth1",
+        :interface => "bond0.3",

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

-        :address => "193.63.75.99"
+        :address => "130.117.76.6"

       },
       },

-      :external_ipv6 => {
-        :interface => "eth1",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:21a:4bff:fea5:fd2a"
+      # :external_ipv6 => {
+      #   :interface => "bond0.3",
+      #   :role => :external,
+      #   :family => :inet6,
+      #   :address => "2001:978:2:2C::172:1006"
+      # }
+    }
+  },
+  :sysctl => {
+    :ipv6_autoconf => {
+      :comment => "Disable IPv6 auto-configuration on internal interface",
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"

       }
     }
   }
       }
     }
   }


@@ -28,8 +40,9 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

+  "role[hp-dl360-g6]",

   "role[web-frontend]",
   "role[web-frontend]",

-  "role[web-gpximport]",
-  "role[web-statistics]",
-  "role[web-cleanup]"
+  # "role[web-gpximport]",
+  # "role[web-statistics]",
+  # "role[web-cleanup]"

 )
 )