From: Julien Cristau <jcristau@debian.org>
Date: Tue, 12 Nov 2019 22:37:56 +0000 (+0100)
Subject: Disabling RA needs to happen late in if-pre-up, so that the interface actually exists
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4a2b55224864c97de43dacbfaa4316fa68ece6e2;p=mirror%2Fdsa-puppet.git

Disabling RA needs to happen late in if-pre-up, so that the interface actually exists

Rename our script to run later than the "vlan" one.
---

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index c03f58e1b..3cb5da6ab 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -340,10 +340,15 @@ class debian_org {
   }
 
   # our ipv6 addresses and routes are statically configured.
-  file { '/etc/network/if-pre-up.d/no_accept_ra':
+  # needs to be late so it runs after other scripts like vlan which actually
+  # create the interface
+  file { '/etc/network/if-pre-up.d/zz_no_accept_ra':
     source => 'puppet:///modules/debian_org/ifupdown-pre-up-accept-ra',
     mode   => '0555',
   }
+  file { '/etc/network/if-pre-up.d/no_accept_ra':
+    ensure => absent,
+  }
   base::sysctl { 'dsa-accept-ra-default':
     ensure => absent,
   }