Use a pre-up script to turn off accept_ra

[mirror/dsa-puppet.git] / modules / debian_org / manifests / init.pp

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index be1fe71..d45b129 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -340,13 +340,15 @@ class debian_org {
        }
 
        # our ipv6 addresses and routes are statically configured.
+       file { '/etc/network/if-pre-up.d/no_accept_ra':
+               source => 'puppet://modules/debian_org/ifupdown-pre-up-accept-ra',
+               mode   => '0555',
+       }
        base::sysctl { 'dsa-accept-ra-default':
-               key   => 'net.ipv6.conf.default.accept_ra',
-               value => 0,
+               ensure => absent,
        }
        base::sysctl { 'dsa-accept-ra-all':
-               key   => 'net.ipv6.conf.all.accept_ra',
-               value => 0,
+               ensure => absent,
        }
 
        # Disable kpartx udev rules