From: Tom Hughes <tom@compton.nu>
Date: Wed, 27 Mar 2019 17:32:14 +0000 (+0000)
Subject: Refetch final interface details before configuring netplan
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d9960db34ed1a5e9ed34e63b6bef0f84690def0b

Refetch final interface details before configuring netplan
---

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index ae3a91d00..f6015a17e 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -50,6 +50,8 @@ node[:networking][:interfaces].each do |name, interface|
     node.normal[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
     node.normal[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
 
+    interface = node[:networking][:interfaces][name]
+
     deviceplan = if interface[:interface] =~ /^(.*)\.(\d+)$/
                    netplan["network"]["vlans"][interface[:interface]] ||= {
                      "id" => Regexp.last_match(2).to_i,