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

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

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 84622aea0bc19792d7800de4f4960be132c0fdad..7ac4eceaead3a90d995efe0fb12544328c0d732a 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -8,19 +8,31 @@ default_attributes(
         :interface => "eth0",
         :role => :internal,
         :family => :inet,
         :interface => "eth0",
         :role => :internal,
         :family => :inet,

-        :address => "146.179.159.162"
+        :address => "146.179.159.162",
+        :hwaddress => "00:1a:4b:a5:0f:ca"

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

-        :address => "193.63.75.99"
+        :address => "193.63.75.99",
+        :hwaddress => "00:1a:4b:a5:fd:2a"

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

-        :address => "2001:630:12:500:21a:4bff:fea5:fd2a"
+        :address => "2001:630:12:500:21a:4bff:fea5:fd2a",
+        :hwaddress => "00:1a:4b:a5:fd:2a"
+      }
+    }
+  },
+  :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,7 +40,9 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

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

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

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

 )
 )