X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fvm%2Fnetwork%2Ftasks%2Fmain.yml;h=c972eedd93343b2a3927f0295b6795dea4321e07;hb=fe6bfadde990f90c7f1fbbbd117c3cd1fc2c035b;hp=6668a4c9108207e02c6bec7b68d84e9a9c8ab78f;hpb=320cd6f207345a4101fe4f353d86d3a66a6eabd3;p=noc.git

diff --git a/ansible/roles/vm/network/tasks/main.yml b/ansible/roles/vm/network/tasks/main.yml
index 6668a4c..c972eed 100644
--- a/ansible/roles/vm/network/tasks/main.yml
+++ b/ansible/roles/vm/network/tasks/main.yml
@@ -9,16 +9,45 @@
         state: absent
 
     - name: install systemd network link units
+      with_items: "{{ network.systemd_link.interfaces }}"
+      loop_control:
+        index_var: interface_index
       template:
         src: systemd.link.j2
-        dest: "/etc/systemd/network/{{ '%02d' | format(item.idx + 10) }}-{{ item.name }}.link"
-      with_items: "{{ vm_network.systemd_link.interfaces }}"
+        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
+  template:
+    src: resolv.conf.j2
+    dest: /etc/resolv.conf