Remove redundant config for disabling IPv6 autoconf

diff --git a/roles/katla.rb b/roles/katla.rb
index 4753dd832ffb95ff8ef73071e08dc4a43549e049..1e471b04099e2c6737c1da56884f8a973b03e198 100644 (file)
--- 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 af861755005fd6f910f1453b871d2bfc090b92a2..628a3935d1476c11b6def3b40d4e3aeb8e453ed8 100644 (file)
--- 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 74f368428de390c63b90fe79231a98bcef1d4650..bbfd5853b04d598e78ffef05abfd54ce14b548b2 100644 (file)
--- 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 3708e1961a63db43f3029ae4629b7200bff089ca..f3cad781650ee83e0fe05377a1e9368a2c7cbb6e 100644 (file)
--- 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 e1c8c95f02e6fbadc80ce05b6a084cb3c107550e..bc2e53f7500aa4f68bf881ae4bb8261a156f87e7 100644 (file)
--- 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 7710900aa7b69ca5426aba3f6da104283043cdd0..ce41465a875584eda11554fac60638aefc2d8324 100644 (file)
--- 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 5e40db358de0838b4ea3fb1861d3d21a21f29fb5..27bd25cf0f8a80ba84ec886b67702024650aa647 100644 (file)
--- 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 a3b1efb2258601e39e4dd8b7fadf9773c5cfcdfa..09754369438317d57d24cecd7ba1bee798efa786 100644 (file)
--- 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 954abeec3639bd52f7c627ad1257b35fc71d45ee..9a2393669242a85d23a8652a14d53bf90c6232ee 100644 (file)
--- 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 8954a8c348440f38991ea47be8496be61aff49a0..7afcfb3be2cb7a1d5d6033576ba8e57855747362 100644 (file)
--- 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 e0b20913d94c055e7784ac495dafa61042689dec..7d0db0e250df50d4b853f733dcd0638bf0ff05b2 100644 (file)
--- 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"
-      }
-    }
   }
 )