Generate wireguard addresses without systemd-id128

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index 6881fcafeb1f1d226779d80b4d529ee30bb9d6c2..8d30dd17cc1f23d6826d37ce433fd6e15f1e9900 100644 (file)
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -1,5 +1,3 @@
-wireguard_id = %x(systemd-id128 machine-id -a 3f36688c233848dfa84e4b176195622e)
-

 default[:networking][:firewall][:enabled] = true
 default[:networking][:firewall][:inet] = []
 default[:networking][:firewall][:inet6] = []
 default[:networking][:firewall][:enabled] = true
 default[:networking][:firewall][:inet] = []
 default[:networking][:firewall][:inet6] = []


@@ -15,6 +13,5 @@ default[:networking][:search] = []
 default[:networking][:dnssec] = "allow-downgrade"
 default[:networking][:hostname] = node.name
 default[:networking][:wireguard][:enabled] = false
 default[:networking][:dnssec] = "allow-downgrade"
 default[:networking][:hostname] = node.name
 default[:networking][:wireguard][:enabled] = false

-default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0, 4]}:#{wireguard_id[4, 4]}:#{wireguard_id[8, 4]}:#{wireguard_id[12, 4]}"

 default[:networking][:wireguard][:keepalive] = false
 default[:networking][:wireguard][:peers] = []
 default[:networking][:wireguard][:keepalive] = false
 default[:networking][:wireguard][:peers] = []

diff --git a/cookbooks/networking/metadata.rb b/cookbooks/networking/metadata.rb
index 3d2944c1555e8fe0bad7da8125dbcba30cebf282..c37012709faf15c9ef5d126c3153770ca8b6d3d2 100644 (file)
--- a/cookbooks/networking/metadata.rb
+++ b/cookbooks/networking/metadata.rb
@@ -5,5 +5,4 @@ license           "Apache-2.0"
 description       "Configures networking"
 
 version           "1.0.0"
 description       "Configures networking"
 
 version           "1.0.0"

-
-supports          "ubuntu"
+depends           "chef"

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 053d98b781f68019201e26da88216c9513b0f9ed..ac847bfc7cbe58df019246552d671d8e93aa89c1 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -186,6 +186,10 @@ package "cloud-init" do
 end
 
 if node[:networking][:wireguard][:enabled]
 end
 
 if node[:networking][:wireguard][:enabled]

+  wireguard_id = persistent_token("networking", "wireguard")
+
+  node.default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0, 4]}:#{wireguard_id[4, 4]}:#{wireguard_id[8, 4]}:#{wireguard_id[12, 4]}"
+

   package "wireguard-tools" do
     compile_time true
   end
   package "wireguard-tools" do
     compile_time true
   end