From: Tom Hughes <tom@compton.nu>
Date: Sun, 24 Apr 2016 21:48:31 +0000 (+0100)
Subject: Ignore RAs on internal network for spikes and thorns
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b98f3ddde4511d30d3fac5ee82486e676f6ba741?ds=sidebyside;hp=18a0465cf12c31ad0473d2d24717cc63bf7b80d9

Ignore RAs on internal network for spikes and thorns
---

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 38ffdfcb0..7ac4eceae 100644
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -30,7 +30,10 @@ default_attributes(
   :sysctl => {
     :ipv6_autoconf => {
       :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
     }
   }
 )
diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 368eaf366..84ee0b118 100644
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -30,7 +30,10 @@ default_attributes(
   :sysctl => {
     :ipv6_autoconf => {
       :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
     }
   }
 )
diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index 532eb8d45..ee85b29d3 100644
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -30,7 +30,10 @@ default_attributes(
   :sysctl => {
     :ipv6_autoconf => {
       :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
     }
   }
 )
diff --git a/roles/thorn-01.rb b/roles/thorn-01.rb
index 0ce995597..32d92d8f5 100644
--- a/roles/thorn-01.rb
+++ b/roles/thorn-01.rb
@@ -15,7 +15,10 @@ default_attributes(
   :sysctl => {
     :ipv6_autoconf => {
       :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
     }
   },
   :web => {
diff --git a/roles/thorn-02.rb b/roles/thorn-02.rb
index 23439c6b4..7f37e8b17 100644
--- a/roles/thorn-02.rb
+++ b/roles/thorn-02.rb
@@ -15,7 +15,10 @@ default_attributes(
   :sysctl => {
     :ipv6_autoconf => {
       :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
     }
   },
   :web => {
diff --git a/roles/thorn-03.rb b/roles/thorn-03.rb
index 998342ad7..d2f7cf602 100644
--- a/roles/thorn-03.rb
+++ b/roles/thorn-03.rb
@@ -15,7 +15,10 @@ default_attributes(
   :sysctl => {
     :ipv6_autoconf => {
       :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
     }
   },
   :web => {