From 17077868e615fa7115abdb03a5af4662ab0a3679 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 23 Apr 2020 01:24:38 +0200 Subject: refactor all install roles ans playbooks to work with new variable install_hostname --- roles/vm/install/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'roles/vm/install') diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml index 20484401..50772e53 100644 --- a/roles/vm/install/tasks/main.yml +++ b/roles/vm/install/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: create lvm-based disks for vm - loop: "{{ hostvars[hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[hostname].install_cooked.disks.scsi | default({})) | dict2items }}" + loop: "{{ hostvars[install_hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[install_hostname].install_cooked.disks.scsi | default({})) | dict2items }}" loop_control: label: "{% if item.value.type == 'lvm' %}{{ item.value.vg }} / {{ item.value.lv }} ({{ item.value.size }}){% else %}unused{% endif %}" when: item.value.type == 'lvm' @@ -11,7 +11,7 @@ state: present - name: create zfs-based disks for vm - loop: "{{ hostvars[hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[hostname].install_cooked.disks.scsi | default({})) | dict2items }}" + loop: "{{ hostvars[install_hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[install_hostname].install_cooked.disks.scsi | default({})) | dict2items }}" loop_control: label: "{% if item.value.type == 'zfs' %}{{ item.value.pool }} / {{ item.value.name }} ({{ item.value.size }}){% else %}unused{% endif %}" when: item.value.type == 'zfs' @@ -30,7 +30,7 @@ - when: install_distro in ['debian', 'ubuntu'] vars: - ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}" + ssh_keys_root: "{{ hostvars[install_hostname].ssh_keys_root }}" preseed_tmpdir: "{{ tmpdir.path }}" preseed_force_net_ifnames_policy: path preseed_no_netplan: yes @@ -40,7 +40,7 @@ - when: install_distro in ['openbsd'] vars: - ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}" + ssh_keys_root: "{{ hostvars[install_hostname].ssh_keys_root }}" obsd_autoinstall_tmpdir: "{{ tmpdir.path }}" obsd_autoinstall_serial_device: com0 install_interface: vio0 @@ -62,7 +62,7 @@ preseed_tmpdir: "{{ tmpdir.path }}" - debug: - msg: "you can check on the status of the installer running this command 'virsh console {{ hostname }}' on host {{ inventory_hostname }}." + msg: "you can check on the status of the installer running this command 'virsh console {{ install_hostname }}' on host {{ inventory_hostname }}." - when: installer_manual_steps_msg is defined pause: @@ -75,7 +75,7 @@ - name: wait for installer to finish or crash wait_for_virt: - name: "{{ hostname }}" + name: "{{ install_hostname }}" states: shutdown,crashed timeout: 1800 register: installer_result -- cgit v1.2.3