From: Tom Hughes <tom@compton.nu>
Date: Sun, 31 Mar 2019 14:33:03 +0000 (+0100)
Subject: Remove redundant config for disabling IPv6 autoconf
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2d07dfd8318cd74ce162149b7fb87dd93401a8ee

Remove redundant config for disabling IPv6 autoconf
---

diff --git a/roles/katla.rb b/roles/katla.rb
index 4753dd832..1e471b040 100644
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -74,13 +74,6 @@ default_attributes(
     }
   },
   :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    },
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => {
diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index af8617550..628a3935d 100644
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -26,15 +26,6 @@ default_attributes(
         :address => "2001:978:2:2C::172:6"
       }
     }
-  },
-  :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"
-      }
-    }
   }
 )
 
diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 74f368428..bbfd5853b 100644
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -26,15 +26,6 @@ default_attributes(
         :address => "2001:978:2:2C::172:7"
       }
     }
-  },
-  :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"
-      }
-    }
   }
 )
 
diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index 3708e1961..f3cad7816 100644
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -26,15 +26,6 @@ default_attributes(
         :address => "2001:978:2:2C::172:8"
       }
     }
-  },
-  :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"
-      }
-    }
   }
 )
 
diff --git a/roles/spike-04.rb b/roles/spike-04.rb
index e1c8c95f0..bc2e53f75 100644
--- a/roles/spike-04.rb
+++ b/roles/spike-04.rb
@@ -26,15 +26,6 @@ default_attributes(
         :address => "2001:41c9:2:d6::21"
       }
     }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    }
   }
 )
 
diff --git a/roles/spike-05.rb b/roles/spike-05.rb
index 7710900aa..ce41465a8 100644
--- a/roles/spike-05.rb
+++ b/roles/spike-05.rb
@@ -26,15 +26,6 @@ default_attributes(
         :address => "2001:41c9:2:d6::22"
       }
     }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    }
   }
 )
 
diff --git a/roles/thorn-01.rb b/roles/thorn-01.rb
index 5e40db358..27bd25cf0 100644
--- a/roles/thorn-01.rb
+++ b/roles/thorn-01.rb
@@ -14,15 +14,6 @@ default_attributes(
         }
       }
     }
-  },
-  :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"
-      }
-    }
   }
 )
 
diff --git a/roles/thorn-02.rb b/roles/thorn-02.rb
index a3b1efb22..097543694 100644
--- a/roles/thorn-02.rb
+++ b/roles/thorn-02.rb
@@ -14,15 +14,6 @@ default_attributes(
         }
       }
     }
-  },
-  :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"
-      }
-    }
   }
 )
 
diff --git a/roles/thorn-03.rb b/roles/thorn-03.rb
index 954abeec3..9a2393669 100644
--- a/roles/thorn-03.rb
+++ b/roles/thorn-03.rb
@@ -14,15 +14,6 @@ default_attributes(
         }
       }
     }
-  },
-  :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"
-      }
-    }
   }
 )
 
diff --git a/roles/thorn-04.rb b/roles/thorn-04.rb
index 8954a8c34..7afcfb3be 100644
--- a/roles/thorn-04.rb
+++ b/roles/thorn-04.rb
@@ -14,15 +14,6 @@ default_attributes(
         }
       }
     }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    }
   }
 )
 
diff --git a/roles/thorn-05.rb b/roles/thorn-05.rb
index e0b20913d..7d0db0e25 100644
--- a/roles/thorn-05.rb
+++ b/roles/thorn-05.rb
@@ -14,15 +14,6 @@ default_attributes(
         }
       }
     }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    }
   }
 )