added fixes for ansible 2.8
authorChristian Pointner <equinox@realraum.at>
Sat, 6 Jul 2019 00:24:24 +0000 (02:24 +0200)
committerChristian Pointner <equinox@realraum.at>
Sat, 6 Jul 2019 00:24:24 +0000 (02:24 +0200)
ansible/roles/base/tasks/03ntp.yml
ansible/roles/debian-installer/defaults/main.yml
ansible/roles/localconfig/tasks/main.yml
ansible/roles/preseed/templates/preseed_debian-buster.cfg.j2 [new file with mode: 0644]
ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
ansible/roles/vm/define/tasks/main.yml
ansible/roles/vm/guest/tasks/main.yml
ansible/roles/vm/network/tasks/main.yml

index 621e7f6..2e4c8e3 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- when: base_managed_ntpd
+- when: base_managed_ntpd | bool
   block:
     - name: check that ISC ntpd is not installed
       apt:
index 94e8d6c..ba20efd 100644 (file)
@@ -4,6 +4,11 @@ distros:
     arch:
       - amd64
       - i386
+  - distro: debian
+    codename: buster
+    arch:
+      - amd64
+      - i386
 
   - distro: ubuntu
     codename: bionic
index 6abee94..a818658 100644 (file)
@@ -27,4 +27,4 @@
     src: ~/.ssh/config.d/
     regexp: "\\.conf$"
     dest: ~/.ssh/config
-  when: localconfig_overwrite_ssh_config
+  when: localconfig_overwrite_ssh_config | bool
diff --git a/ansible/roles/preseed/templates/preseed_debian-buster.cfg.j2 b/ansible/roles/preseed/templates/preseed_debian-buster.cfg.j2
new file mode 100644 (file)
index 0000000..3e44ec9
--- /dev/null
@@ -0,0 +1,124 @@
+#########################################################################
+#  realraum preseed file for Debian buster based VMs
+#########################################################################
+
+d-i debian-installer/language string en
+d-i debian-installer/country string AT
+d-i debian-installer/locale string en_US.UTF-8
+d-i keyboard-configuration/xkb-keymap select us
+
+d-i hw-detect/load_firmware boolean false
+
+d-i netcfg/disable_dhcp boolean true
+d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
+d-i netcfg/disable_autoconfig boolean false
+d-i netcfg/get_ipaddress string {{ hostvars[hostname].network_cooked.primary.ip }}
+d-i netcfg/get_netmask string {{ hostvars[hostname].network_cooked.primary.mask }}
+d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gateway }}
+d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
+d-i netcfg/confirm_static boolean true
+
+d-i netcfg/hostname string {{ hostname }}
+d-i netcfg/get_hostname string {{ hostname }}
+d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
+d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
+d-i netcfg/wireless_wep string
+
+
+d-i mirror/country string manual
+d-i mirror/http/hostname string debian.ffgraz.net
+d-i mirror/http/directory string /debian
+d-i mirror/http/proxy string
+
+
+d-i passwd/make-user boolean false
+d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand
+d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand
+
+
+d-i clock-setup/utc boolean true
+d-i time/zone string Europe/Vienna
+d-i clock-setup/ntp boolean false
+
+
+d-i partman/early_command string \
+    debconf-set partman-auto/disk "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \
+    debconf-set grub-installer/bootdev "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \
+    umount -l /media || true
+
+d-i grub-installer/choose_bootdev string manual
+d-i grub-installer/bootdev seen true
+
+d-i partman-auto/method string lvm
+d-i partman-auto/purge_lvm_from_device boolean true
+d-i partman-auto-lvm/new_vg_name string {{ hostname }}
+d-i partman-auto-lvm/guided_size string max
+
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-md/device_remove_md boolean true
+
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+
+d-i partman-auto/expert_recipe string                                    \
+      boot-root ::                                                       \
+              1000 10000 -1 ext4                                         \
+                      $defaultignore{ } $primary{ } $bootable{ }         \
+                      method{ lvm } vg_name{ {{ hostname }} }            \
+              .                                                          \
+              2048 10000 2560 ext4                                       \
+                      $lvmok{ } in_vg{ {{ hostname }} }                  \
+                      method{ format } format{ }                         \
+                      use_filesystem{ } filesystem{ ext4 }               \
+                      mountpoint{ / }                                    \
+              .                                                          \
+              1024 11000 1280 ext4                                       \
+                      $lvmok{ } in_vg{ {{ hostname }} }                  \
+                      method{ format } format{ }                         \
+                      use_filesystem{ } filesystem{ ext4 }               \
+                      mountpoint{ /var }                                 \
+              .                                                          \
+              768 10000 768 ext4                                         \
+                      $lvmok{ } in_vg{ {{ hostname }} }                  \
+                      method{ format } format{ }                         \
+                      use_filesystem{ } filesystem{ ext4 }               \
+                      mountpoint{ /var/log }                             \
+                      options/nodev{ nodev } options/noatime{ noatime }  \
+                      options/noexec{ noexec }                           \
+              .                                                          \
+              16 20000 -1 ext4                                           \
+                      $lvmok{ } in_vg{ {{ hostname }} } lv_name{ dummy } \
+              .
+
+d-i partman-auto-lvm/no_boot boolean true
+d-i partman-basicfilesystems/no_swap true
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+
+d-i base-installer/install-recommends boolean false
+d-i apt-setup/security_host string debian.ffgraz.net
+
+tasksel tasksel/first multiselect
+d-i pkgsel/include string openssh-server python3 python3-apt
+d-i pkgsel/upgrade select safe-upgrade
+popularity-contest popularity-contest/participate boolean false
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean false
+
+d-i finish-install/reboot_in_progress note
+
+
+d-i preseed/late_command string \
+    lvremove -f {{ hostname }}/dummy; \
+    in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
+    in-target bash -c "passwd -d root && passwd -l root"; \
+    in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \
+    mkdir -p -m 0700 /target/root/.ssh; \
+    cp /authorized_keys /target/root/.ssh/; \
+{% if hostvars[hostname].ansible_port is defined %}
+    in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config"
+{% endif %}
index 5692eb9..daaa37a 100644 (file)
@@ -102,7 +102,7 @@ d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string debian.ffgraz.net
 
 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
 
index d401344..f37fa58 100644 (file)
@@ -107,7 +107,7 @@ d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string debian.ffgraz.net
 
 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
index b8dcece..e70dfb4 100644 (file)
@@ -107,7 +107,7 @@ d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string debian.ffgraz.net
 
 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
index 5667658..afe7e92 100644 (file)
 
 - name: redefine vm
   virt:
-    name: "{{ hostname }}"
     command: define
     xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}"
 
-- when: vm_define_start
+- when: vm_define_start | bool
   block:
     - name: start vm
       virt:
@@ -44,7 +43,7 @@
         timeout: 10
 
 - name: mark vm as autostarted
-  when: vm_define_autostart
+  when: vm_define_autostart | bool
   virt:
     name: "{{ hostname }}"
     autostart: yes
index 4830d05..e3ffd10 100644 (file)
@@ -2,6 +2,7 @@
   apt:
     name: rng-tools
     state: present
+    force_apt_get: yes
 
 - name: Configure rngd [1/2]
   lineinfile:
index 9bef36e..c972eed 100644 (file)
@@ -44,6 +44,7 @@
   apt:
     name: resolvconf
     state: absent
+    force_apt_get: yes
     purge: yes
 
 - name: generate resolv.conf