Update chef client to 12.10.24

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 05626dc5f5cb386a8e01b0e0146f30c1c113704b..84ee0b118caa9557b91708be0d0c8c60f96020f1 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,6 +4,13 @@ description "Master role applied to spike-02"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "eth0",
+        :role => :internal,
+        :family => :inet,
+        :address => "146.179.159.163",
+        :hwaddress => "00:1b:78:04:76:c0"
+      },

       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,


@@ -19,11 +26,20 @@ default_attributes(
         :hwaddress => "00:1b:78:04:a5:5a"
       }
     }
         :hwaddress => "00:1b:78:04:a5:5a"
       }
     }

+  },
+  :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"
+      }
+    }

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

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

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