Remove last traces of legacy certificate support

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

diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index 433fd3cb8031583279da46c6355e9f0a52e5b733..ee85b29d34727d17efa1e1c7032c53c1331557a8 100644 (file)
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -8,19 +8,31 @@ default_attributes(
         :interface => "eth0",
         :role => :internal,
         :family => :inet,
         :interface => "eth0",
         :role => :internal,
         :family => :inet,

-        :address => "146.179.159.171"
+        :address => "146.179.159.171",
+        :hwaddress => "00:19:bb:39:8a:bc"

       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.103"
+        :address => "193.63.75.103",
+        :hwaddress => "00:19:bb:39:8a:ba"

       },
       :external_ipv6 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet6,
       },
       :external_ipv6 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet6,

-        :address => "2001:630:12:500:219:bbff:fe39:8aba"
+        :address => "2001:630:12:500:219:bbff:fe39:8aba",
+        :hwaddress => "00:19:bb:39:8a:ba"
+      }
+    }
+  },
+  :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,5 +40,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

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

   "role[web-frontend]"
 )
   "role[web-frontend]"
 )