X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fvm%2Fnetwork%2Ftasks%2Fmain.yml;h=baae45531d69b90a1f9a4643e3d3c68a6d273e48;hb=1172184b256e3db226ae44b8db9f0ad10ce81f0a;hp=3d51fff292370332b562755524d082d86812d005;hpb=77b472fea236e38bf6b1ffe99187f850d8727962;p=noc.git

diff --git a/ansible/roles/vm/network/tasks/main.yml b/ansible/roles/vm/network/tasks/main.yml
index 3d51fff..baae455 100644
--- a/ansible/roles/vm/network/tasks/main.yml
+++ b/ansible/roles/vm/network/tasks/main.yml
@@ -9,26 +9,43 @@
         state: absent
 
     - name: install systemd network link units
-      with_items: "{{ vm_network.systemd_link.interfaces }}"
+      with_items: "{{ network.systemd_link.interfaces }}"
       loop_control:
+        label: "{{ item.name }}"
         index_var: interface_index
       template:
         src: systemd.link.j2
         dest: "/etc/systemd/network/{{ '%02d' | format(interface_index + 11) }}-{{ item.name }}.link"
       notify: rebuild initramfs
 
-  when: vm_network.systemd_link is defined
+  when: network.systemd_link is defined
 
 - name: install basic interface config
   template:
     src: interfaces.j2
     dest: /etc/network/interfaces
     mode: 0644
+  when: ansible_distribution == "Debian" or (ansible_distribution == "Ubuntu" and (ansible_distribution_major_version | int) < 18)
+
+- block:
+    - name: remove default netplan config
+      file:
+        path: /etc/netplan/01-netcfg.yaml
+        state: absent
+
+    - name: install basic netplan config
+      template:
+        src: netplan.yaml.j2
+        dest: "/etc/netplan/01-{{ network.primary.interface }}.yaml"
+        mode: 0644
+
+  when:  ansible_distribution == "Ubuntu" and (ansible_distribution_major_version | int) >= 18
 
 - name: remove resolvconf package
   apt:
     name: resolvconf
     state: absent
+    force_apt_get: yes
     purge: yes
 
 - name: generate resolv.conf