space_server: networkd: smarter set difference

22 files changed, 3 insertions, 4 deletions

diff --git a/roles/space_server/files/network/10-lan.link b/roles/space_server/files/networkd/10-lan.link
index 996917e..996917e 100644
--- a/roles/space_server/files/network/10-lan.link
+++ b/roles/space_server/files/networkd/10-lan.link
diff --git a/roles/space_server/files/network/10-lan.network b/roles/space_server/files/networkd/10-lan.network
index 08b85aa..08b85aa 100644
--- a/roles/space_server/files/network/10-lan.network
+++ b/roles/space_server/files/networkd/10-lan.network
diff --git a/roles/space_server/files/network/10-lan10.netdev b/roles/space_server/files/networkd/10-lan10.netdev
index 655859d..655859d 100644
--- a/roles/space_server/files/network/10-lan10.netdev
+++ b/roles/space_server/files/networkd/10-lan10.netdev
diff --git a/roles/space_server/files/network/10-lan10.network b/roles/space_server/files/networkd/10-lan10.network
index 18931e0..18931e0 100644
--- a/roles/space_server/files/network/10-lan10.network
+++ b/roles/space_server/files/networkd/10-lan10.network
diff --git a/roles/space_server/files/network/10-lan11.netdev b/roles/space_server/files/networkd/10-lan11.netdev
index b99b50b..b99b50b 100644
--- a/roles/space_server/files/network/10-lan11.netdev
+++ b/roles/space_server/files/networkd/10-lan11.netdev
diff --git a/roles/space_server/files/network/10-lan11.network b/roles/space_server/files/networkd/10-lan11.network
index 88d714f..88d714f 100644
--- a/roles/space_server/files/network/10-lan11.network
+++ b/roles/space_server/files/networkd/10-lan11.network
diff --git a/roles/space_server/files/network/10-lan12.netdev b/roles/space_server/files/networkd/10-lan12.netdev
index 7229fa1..7229fa1 100644
--- a/roles/space_server/files/network/10-lan12.netdev
+++ b/roles/space_server/files/networkd/10-lan12.netdev
diff --git a/roles/space_server/files/network/10-lan12.network b/roles/space_server/files/networkd/10-lan12.network
index 7f48f5b..7f48f5b 100644
--- a/roles/space_server/files/network/10-lan12.network
+++ b/roles/space_server/files/networkd/10-lan12.network
diff --git a/roles/space_server/files/network/10-lan13.netdev b/roles/space_server/files/networkd/10-lan13.netdev
index ab05488..ab05488 100644
--- a/roles/space_server/files/network/10-lan13.netdev
+++ b/roles/space_server/files/networkd/10-lan13.netdev
diff --git a/roles/space_server/files/network/10-lan13.network b/roles/space_server/files/networkd/10-lan13.network
index 81e3911..81e3911 100644
--- a/roles/space_server/files/network/10-lan13.network
+++ b/roles/space_server/files/networkd/10-lan13.network
diff --git a/roles/space_server/files/network/10-lan14.netdev b/roles/space_server/files/networkd/10-lan14.netdev
index 1956a88..1956a88 100644
--- a/roles/space_server/files/network/10-lan14.netdev
+++ b/roles/space_server/files/networkd/10-lan14.netdev
diff --git a/roles/space_server/files/network/10-lan14.network b/roles/space_server/files/networkd/10-lan14.network
index 5b40bbf..5b40bbf 100644
--- a/roles/space_server/files/network/10-lan14.network
+++ b/roles/space_server/files/networkd/10-lan14.network
diff --git a/roles/space_server/files/network/10-lan15.netdev b/roles/space_server/files/networkd/10-lan15.netdev
index c31a650..c31a650 100644
--- a/roles/space_server/files/network/10-lan15.netdev
+++ b/roles/space_server/files/networkd/10-lan15.netdev
diff --git a/roles/space_server/files/network/10-lan15.network b/roles/space_server/files/networkd/10-lan15.network
index e3c99dd..e3c99dd 100644
--- a/roles/space_server/files/network/10-lan15.network
+++ b/roles/space_server/files/networkd/10-lan15.network
diff --git a/roles/space_server/files/network/10-lan20.netdev b/roles/space_server/files/networkd/10-lan20.netdev
index 2b2e0d8..2b2e0d8 100644
--- a/roles/space_server/files/network/10-lan20.netdev
+++ b/roles/space_server/files/networkd/10-lan20.netdev
diff --git a/roles/space_server/files/network/10-lan20.network b/roles/space_server/files/networkd/10-lan20.network
index 06b1ff1..06b1ff1 100644
--- a/roles/space_server/files/network/10-lan20.network
+++ b/roles/space_server/files/networkd/10-lan20.network
diff --git a/roles/space_server/files/network/10-lo.network b/roles/space_server/files/networkd/10-lo.network
index 9b89210..9b89210 100644
--- a/roles/space_server/files/network/10-lo.network
+++ b/roles/space_server/files/networkd/10-lo.network
diff --git a/roles/space_server/files/network/10-mgt.link b/roles/space_server/files/networkd/10-mgt.link
index 715f409..715f409 100644
--- a/roles/space_server/files/network/10-mgt.link
+++ b/roles/space_server/files/networkd/10-mgt.link
diff --git a/roles/space_server/files/network/10-mgt.network b/roles/space_server/files/networkd/10-mgt.network
index 9da626e..9da626e 100644
--- a/roles/space_server/files/network/10-mgt.network
+++ b/roles/space_server/files/networkd/10-mgt.network
diff --git a/roles/space_server/files/network/10-wan.link b/roles/space_server/files/networkd/10-wan.link
index 47a7270..47a7270 100644
--- a/roles/space_server/files/network/10-wan.link
+++ b/roles/space_server/files/networkd/10-wan.link
diff --git a/roles/space_server/files/network/10-wan.network b/roles/space_server/files/networkd/10-wan.network
index 1d14dee..1d14dee 100644
--- a/roles/space_server/files/network/10-wan.network
+++ b/roles/space_server/files/networkd/10-wan.network
diff --git a/roles/space_server/tasks/networkd.yml b/roles/space_server/tasks/networkd.yml
index 0059ed6..364d9cb 100644
--- a/roles/space_server/tasks/networkd.yml
+++ b/roles/space_server/tasks/networkd.yml
@@ -1,5 +1,5 @@
 ---
-- name: Make sure directory exists
+- name: Make sure /etc/systemd/network exists
   file:
     dest: '/etc/systemd/network'
     state: directory
@@ -19,15 +19,14 @@
     owner: root
     group: root
     mode: 0644
-  with_fileglob: 'network/*'
+  with_fileglob: 'networkd/*'
   register: networkd_created
 
 - name: Delete unneeded network configuration
   file:
     path: '{{ item }}'
     state: absent
-  with_items: "{{ networkd_existing.files|map(attribute='path')|list }}"
-  when: "item not in networkd_created.results|map(attribute='dest')"
+  with_items: "{{ networkd_existing.files|map(attribute='path')|difference(networkd_created.results|map(attribute='dest'))|list }}"
 
 - name: Create systemd-networkd-wait-online drop-in directory
   file: