From 4bce4e54c4e97d0fa4128dee67f57ba33ef6a2b0 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 7 Dec 2017 17:59:15 +0100 Subject: harmonized yaml syntax --- roles/vm-install/tasks/main.yaml | 9 ++++++++- roles/vm-install/templates/preseed_debian-stretch.cfg.j2 | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'roles/vm-install') diff --git a/roles/vm-install/tasks/main.yaml b/roles/vm-install/tasks/main.yaml index 2e914ebc..0c95e599 100644 --- a/roles/vm-install/tasks/main.yaml +++ b/roles/vm-install/tasks/main.yaml @@ -99,9 +99,16 @@ virt: name: "{{ inventory_hostname }}" state: running - autostart: "{{ vm_install.autostart | default(omit) }}" delegate_to: "{{ vm_install.host }}" +- name: mark vm as autostarted + virt: + name: "{{ inventory_hostname }}" + autostart: "{{ vm_install.autostart }}" + command: info ## virt module needs either command or state + delegate_to: "{{ vm_install.host }}" + when: vm_install.autostart is defined + - name: wait for vm to start up wait_for_connection: delay: 5 diff --git a/roles/vm-install/templates/preseed_debian-stretch.cfg.j2 b/roles/vm-install/templates/preseed_debian-stretch.cfg.j2 index c8f4b45f..267da58b 100644 --- a/roles/vm-install/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/vm-install/templates/preseed_debian-stretch.cfg.j2 @@ -53,21 +53,18 @@ d-i partman-auto/expert_recipe string \ . \ 1536 10000 2048 ext4 \ $lvmok{ } in_vg{ {{ inventory_hostname }} } \ - lv_name { root } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \ . \ 1024 11000 1280 ext4 \ $lvmok{ } in_vg{ {{ inventory_hostname }} } \ - lv_name { var } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var } \ . \ 768 10000 768 ext4 \ $lvmok{ } in_vg{ {{ inventory_hostname }} } \ - lv_name { varlog } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var/log } \ -- cgit v1.2.3