From 79d662045cba5c0c424f884e6de2ba11d90c530d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 5 Jul 2019 19:50:27 +0200 Subject: bugfixes and cleanup of vm/install --- roles/base/tasks/main.yml | 2 +- roles/preseed/templates/preseed_debian-buster.cfg.j2 | 2 +- roles/preseed/templates/preseed_debian-stretch.cfg.j2 | 2 +- roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 2 +- roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 2 +- .../preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 | 2 +- roles/vm/guest/tasks/main.yml | 1 + roles/vm/install/tasks/main.yml | 4 ++-- roles/vm/network/tasks/main.yml | 2 ++ 9 files changed, 11 insertions(+), 8 deletions(-) (limited to 'roles') diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index e82ccfad..5cba5bd7 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -54,7 +54,7 @@ - name: install haveged - when: base_entropy_generator != 'rngd' + when: base_entropy_generator == 'haveged' block: - name: install haveged apt: diff --git a/roles/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/preseed/templates/preseed_debian-buster.cfg.j2 index 9d5ccf7e..91cd687a 100644 --- a/roles/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-buster.cfg.j2 @@ -119,7 +119,7 @@ d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string deb.debian.org tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python3 +d-i pkgsel/include string openssh-server python3 python3-apt d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index 69b8ff33..a5bef09e 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -119,7 +119,7 @@ d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string deb.debian.org tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python +d-i pkgsel/include string openssh-server python python-apt d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index fc8cc530..d2188392 100644 --- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -124,7 +124,7 @@ d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string archive.ubuntu.com tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python +d-i pkgsel/include string openssh-server python python-apt d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 0b732051..e49a3886 100644 --- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -124,7 +124,7 @@ d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string archive.ubuntu.com tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python +d-i pkgsel/include string openssh-server python python-apt d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none diff --git a/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 b/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 index e1cc2731..cc4c4714 100644 --- a/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 +++ b/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 @@ -121,7 +121,7 @@ d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string debian.ffgraz.net tasksel tasksel/first multiselect xubuntu-desktop -d-i pkgsel/include string openssh-server python +d-i pkgsel/include string openssh-server python python-apt d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none diff --git a/roles/vm/guest/tasks/main.yml b/roles/vm/guest/tasks/main.yml index 68c36be3..c3a346d7 100644 --- a/roles/vm/guest/tasks/main.yml +++ b/roles/vm/guest/tasks/main.yml @@ -2,6 +2,7 @@ apt: name: rng-tools state: present + force_apt_get: yes - name: Configure rngd [1/2] loop: '{{ rngd_config | dict2items }}' diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml index dc272b67..9d603712 100644 --- a/roles/vm/install/tasks/main.yml +++ b/roles/vm/install/tasks/main.yml @@ -1,6 +1,8 @@ --- - name: create disks for vm loop: "{{ hostvars[hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[hostname].install_cooked.disks.scsi | default({})) | dict2items }}" + loop_control: + label: "{{ item.value.vg }} / {{ item.value.lv }} ({{ item.value.size }})" lvol: vg: "{{ item.value.vg }}" lv: "{{ item.value.lv }}" @@ -54,7 +56,6 @@ - name: define new installer vm virt: - name: "{{ hostname }}" command: define xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}" vars: @@ -96,7 +97,6 @@ - name: define new production vm virt: - name: "{{ hostname }}" command: define xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}" vars: diff --git a/roles/vm/network/tasks/main.yml b/roles/vm/network/tasks/main.yml index cb73ef6e..527ccdfa 100644 --- a/roles/vm/network/tasks/main.yml +++ b/roles/vm/network/tasks/main.yml @@ -11,6 +11,7 @@ - name: install systemd network link units loop: "{{ network.systemd_link.interfaces }}" loop_control: + label: "{{ item.name }}" index_var: interface_index template: src: systemd.link.j2 @@ -44,6 +45,7 @@ apt: name: resolvconf state: absent + force_apt_get: yes purge: yes - name: generate resolv.conf -- cgit v1.2.3