don't use install_hostname variable in roles

10 files changed, 42 insertions, 42 deletions

diff --git a/roles/installer/debian/iso/defaults/main.yml b/roles/installer/debian/iso/defaults/main.yml
index 8949e5b3..afdb2df8 100644
--- a/roles/installer/debian/iso/defaults/main.yml
+++ b/roles/installer/debian/iso/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-iso_install_target_dir: "{{ global_artifacts_dir }}/{{ install_hostname }}/debian-installer"
+iso_install_target_dir: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/debian-installer"
diff --git a/roles/installer/debian/iso/tasks/main.yml b/roles/installer/debian/iso/tasks/main.yml
index fd2f941d..3170c7b5 100644
--- a/roles/installer/debian/iso/tasks/main.yml
+++ b/roles/installer/debian/iso/tasks/main.yml
@@ -12,7 +12,7 @@
 - block:
   - name: create temporary workdir
     tempfile:
-      prefix: "iso-install.{{ install_hostname }}."
+      prefix: "iso-install.{{ inventory_hostname }}."
       state: directory
     register: tmpdir
 
@@ -51,11 +51,11 @@
 
   - name: make sure target image does not exist
     file:
-      path: "{{ iso_install_target_dir }}/{{ install_hostname }}.iso"
+      path: "{{ iso_install_target_dir }}/{{ inventory_hostname }}.iso"
       state: absent
 
   - name: generate target iso image
-    command: xorriso -indev "{{ debian_installer_target_dir }}/mini.iso" -outdev "{{ iso_install_target_dir }}/{{ install_hostname }}.iso" -boot_image any replay -update initrd.gz initrd.gz -update isolinux.cfg isolinux.cfg -update grub.cfg /boot/grub/grub.cfg
+    command: xorriso -indev "{{ debian_installer_target_dir }}/mini.iso" -outdev "{{ iso_install_target_dir }}/{{ inventory_hostname }}.iso" -boot_image any replay -update initrd.gz initrd.gz -update isolinux.cfg isolinux.cfg -update grub.cfg /boot/grub/grub.cfg
     args:
       chdir: "{{ tmpdir.path }}"
 
diff --git a/roles/installer/debian/iso/templates/grub.cfg.j2 b/roles/installer/debian/iso/templates/grub.cfg.j2
index d13ca96d..12b8837b 100644
--- a/roles/installer/debian/iso/templates/grub.cfg.j2
+++ b/roles/installer/debian/iso/templates/grub.cfg.j2
@@ -14,7 +14,7 @@ set menu_color_highlight=black/light-gray
 set timeout=10
 set default=0
 
-menuentry "automated installer for {{ install_hostname }}" {
+menuentry "automated installer for {{ inventory_hostname }}" {
 	linux	/linux --- auto {{ (install_cooked.kernel_cmdline | default([])) | join(' ') }}
 	initrd	/initrd.gz
 }
diff --git a/roles/installer/debian/iso/templates/isolinux.cfg.j2 b/roles/installer/debian/iso/templates/isolinux.cfg.j2
index 0fb43c25..1a758bda 100644
--- a/roles/installer/debian/iso/templates/isolinux.cfg.j2
+++ b/roles/installer/debian/iso/templates/isolinux.cfg.j2
@@ -1,4 +1,4 @@
-DEFAULT {{ install_hostname }}
+DEFAULT {{ inventory_hostname }}
 TIMEOUT 100
 PROMPT 1
 SAY *****************************************
@@ -6,10 +6,10 @@ SAY **
 SAY **  Distro:   {{ install_distro }}
 SAY **  Codename: {{ install_codename }}
 SAY **
-SAY **  will be booting automated installer for {{ install_hostname }} in 10s ...
+SAY **  will be booting automated installer for {{ inventory_hostname }} in 10s ...
 SAY **
 
-LABEL {{ install_hostname }}
+LABEL {{ inventory_hostname }}
   KERNEL linux
   INITRD initrd.gz
   APPEND auto fb=false {{ (install_cooked.kernel_cmdline | default([])) | join(' ') }}
diff --git a/roles/installer/debian/usb/tasks/main.yml b/roles/installer/debian/usb/tasks/main.yml
index b9969677..e02f38e6 100644
--- a/roles/installer/debian/usb/tasks/main.yml
+++ b/roles/installer/debian/usb/tasks/main.yml
@@ -40,18 +40,18 @@
 - block:
   - name: create temporary workdir
     tempfile:
-      prefix: "usb-install.{{ install_hostname }}."
+      prefix: "usb-install.{{ inventory_hostname }}."
       state: directory
     register: tmpdir
 
   - name: copy the original initramfs to the usb drive
     copy:
       src: "{{ debian_installer_target_dir }}/initrd.gz"
-      dest: "{{ usb_install_path }}/initrd.{{ install_hostname }}.gz"
+      dest: "{{ usb_install_path }}/initrd.{{ inventory_hostname }}.gz"
 
   - name: generate host specific initial ramdisk
     vars:
-      preseed_initrd: "{{ usb_install_path }}/initrd.{{ install_hostname }}.gz"
+      preseed_initrd: "{{ usb_install_path }}/initrd.{{ inventory_hostname }}.gz"
       preseed_tmpdir: "{{ tmpdir.path }}"
     import_role:
       name: installer/debian/preseed
diff --git a/roles/installer/debian/usb/templates/syslinux.cfg.j2 b/roles/installer/debian/usb/templates/syslinux.cfg.j2
index 4531c1f9..98890372 100644
--- a/roles/installer/debian/usb/templates/syslinux.cfg.j2
+++ b/roles/installer/debian/usb/templates/syslinux.cfg.j2
@@ -1,5 +1,5 @@
 {% if (ansible_play_hosts_all | length) == 1 %}
-DEFAULT {{ install_hostname }}
+DEFAULT {{ inventory_hostname }}
 TIMEOUT 100
 PROMPT 1
 SAY *****************************************
@@ -7,7 +7,7 @@ SAY **
 SAY **  Distro:   {{ install_distro }}
 SAY **  Codename: {{ install_codename }}
 SAY **
-SAY **  will be booting automated installer for {{ install_hostname }} in 10s ...
+SAY **  will be booting automated installer for {{ inventory_hostname }} in 10s ...
 SAY **
 {% else %}
 DEFAULT menu.c32
diff --git a/roles/installer/openbsd/autoinstall/tasks/main.yml b/roles/installer/openbsd/autoinstall/tasks/main.yml
index fc5f6194..8c84aaf0 100644
--- a/roles/installer/openbsd/autoinstall/tasks/main.yml
+++ b/roles/installer/openbsd/autoinstall/tasks/main.yml
@@ -1,16 +1,16 @@
 ---
 - name: create temporary directories
   loop:
-    - files/etc
-    - site/
+  - files/etc
+  - site/
   file:
     path: "{{ obsd_autoinstall_tmpdir }}/{{ item }}"
     state: directory
 
 - name: generate bootloader and installer configuration
   loop:
-    - auto_install.conf
-    - boot.conf
+  - auto_install.conf
+  - boot.conf
   template:
     src: "{{ item }}.j2"
     dest: "{{ obsd_autoinstall_tmpdir }}/files/etc/{{ item }}"
@@ -21,13 +21,13 @@
 - name: extract installer files from iso
   vars:
     installer_files:
-      - cdbr
-      - cdboot
-      - bsd
-      - bsd.mp
-      - bsd.rd
-      - "INSTALL.{{ obsd_autoinstall_arch }}"
-      - "{{ obsd_autoinstall_file_sets | product([obsd_autoinstall_version_short+'.tgz']) | map('join') | list }}"
+    - cdbr
+    - cdboot
+    - bsd
+    - bsd.mp
+    - bsd.rd
+    - "INSTALL.{{ obsd_autoinstall_arch }}"
+    - "{{ obsd_autoinstall_file_sets | product([obsd_autoinstall_version_short+'.tgz']) | map('join') | list }}"
   iso_extract:
     image: "{{ obsd_autoinstall_orig_iso }}"
     dest: "{{ obsd_autoinstall_tmpdir }}/files"
@@ -45,7 +45,7 @@
     dest: "{{ obsd_autoinstall_tmpdir }}/files/site{{ obsd_autoinstall_version_short }}.tgz"
 
 - name: generate host specific installer image
-  command: 'genisoimage -RTLldDN -o "{{ install_hostname }}.iso" -no-emul-boot -b "cdbr" -c "boot.catalog" files/'
+  command: 'genisoimage -RTLldDN -o "{{ inventory_hostname }}.iso" -no-emul-boot -b "cdbr" -c "boot.catalog" files/'
   args:
     chdir: "{{ obsd_autoinstall_tmpdir }}/"
 
diff --git a/roles/vm/guest/define/tasks/main.yml b/roles/vm/guest/define/tasks/main.yml
index 65094bbb..a4405de1 100644
--- a/roles/vm/guest/define/tasks/main.yml
+++ b/roles/vm/guest/define/tasks/main.yml
@@ -2,28 +2,28 @@
 - name: check if vm already exists
   delegate_to: "{{ vm_host_cooked.name }}"
   virt:
-    name: "{{ install_hostname }}"
+    name: "{{ inventory_hostname }}"
     command: info
   register: vmhost_info
 
 - name: remove old vm
-  when: install_hostname in vmhost_info
+  when: inventory_hostname in vmhost_info
   delegate_to: "{{ vm_host_cooked.name }}"
   block:
   - name: destroy exisiting vm
     virt:
-      name: "{{ install_hostname }}"
+      name: "{{ inventory_hostname }}"
       state: destroyed
 
   - name: wait for vm to be destroyed
     wait_for_virt:
-      name: "{{ install_hostname }}"
+      name: "{{ inventory_hostname }}"
       states: shutdown,crashed
       timeout: 5
 
   - name: undefining exisiting vm
     virt:
-      name: "{{ install_hostname }}"
+      name: "{{ inventory_hostname }}"
       command: undefine
 
 - name: define vm
@@ -38,18 +38,18 @@
   block:
   - name: start vm
     virt:
-      name: "{{ install_hostname }}"
+      name: "{{ inventory_hostname }}"
       state: running
 
   - name: wait for VM to start
     wait_for_virt:
-      name: "{{ install_hostname }}"
+      name: "{{ inventory_hostname }}"
       states: running
       timeout: 10
 
 - name: mark vm as autostarted
   delegate_to: "{{ vm_host_cooked.name }}"
   virt:
-    name: "{{ install_hostname }}"
+    name: "{{ inventory_hostname }}"
     autostart: "{{ vm_define_autostart }}"
     command: info ## virt module needs either command or state
diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2
index ce8a48d4..28f237a9 100644
--- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2
+++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>{{ install_hostname }}</name>
+  <name>{{ inventory_hostname }}</name>
   <memory>{{ ((install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</memory>
   <currentMemory>{{ ((install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</currentMemory>
   <vcpu>{{ install_cooked.vm.numcpus }}</vcpu>
@@ -44,7 +44,7 @@
 {% if vm_define_installer and install_distro == 'openbsd' %}
     <disk type='file' device='cdrom'>
       <driver name='qemu'/>
-      <source file='{{ installer_tmpdir }}/{{ install_hostname }}.iso'/>
+      <source file='{{ installer_tmpdir }}/{{ inventory_hostname }}.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
@@ -57,7 +57,7 @@
 {%     if src.type == 'lvm' %}
       <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/>
 {%     elif src.type == 'zfs' %}
-      <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ install_hostname }}/{{ src.name }}'/>
+      <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/>
 {%     endif %}
       <target dev='{{ device }}' bus='virtio'/>
     </disk>
@@ -72,7 +72,7 @@
 {%     if src.type == 'lvm' %}
       <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/>
 {%     elif src.type == 'zfs' %}
-      <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ install_hostname }}/{{ src.name }}'/>
+      <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/>
 {%     endif %}
       <target dev='{{ device }}' bus='scsi'/>
     </disk>
diff --git a/roles/vm/guest/install/tasks/main.yml b/roles/vm/guest/install/tasks/main.yml
index 0172c5bb..32bd9b7b 100644
--- a/roles/vm/guest/install/tasks/main.yml
+++ b/roles/vm/guest/install/tasks/main.yml
@@ -14,7 +14,7 @@
   loop: "{{ install_cooked.disks.virtio | default({}) | combine(install_cooked.disks.scsi | default({})) | dict2items | selectattr('value.type', 'eq', 'zfs') | map(attribute='value.backend') | map('default', 'default') | unique | list }}"
   delegate_to: "{{ vm_host_cooked.name }}"
   zfs:
-    name: "{{ vm_host_cooked.zfs[item].pool }}/{{ vm_host_cooked.zfs[item].name }}/{{ install_hostname }}"
+    name: "{{ vm_host_cooked.zfs[item].pool }}/{{ vm_host_cooked.zfs[item].name }}/{{ inventory_hostname }}"
     state: present
     extra_zfs_properties:
       canmount: no
@@ -26,7 +26,7 @@
     label: "{{ item.value.name }} on backend {{ item.value.backend | default('default') }} ({{ item.value.size }})"
   delegate_to: "{{ vm_host_cooked.name }}"
   zfs:
-    name: "{{ vm_host_cooked.zfs[item.value.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[item.value.backend | default('default')].name }}/{{ install_hostname }}/{{ item.value.name }}"
+    name: "{{ vm_host_cooked.zfs[item.value.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[item.value.backend | default('default')].name }}/{{ inventory_hostname }}/{{ item.value.name }}"
     state: present
     extra_zfs_properties: "{{ item.value.properties | default({}) | combine({'volsize': item.value.size}) }}"
 
@@ -36,7 +36,7 @@
   - name: create a temporary workdir
     tempfile:
       path: "{{ hostvars[vm_host_cooked.name].installer_base_path }}/"
-      prefix: ".{{ install_hostname }}."
+      prefix: ".{{ inventory_hostname }}."
       state: directory
     register: tmpdir
 
@@ -62,7 +62,7 @@
       name: vm/guest/define
 
   - debug:
-      msg: "you can check on the status of the installer running this command 'virsh console {{ install_hostname }}' on host {{ vm_host_cooked.name }}."
+      msg: "you can check on the status of the installer running this command 'virsh console {{ inventory_hostname }}' on host {{ vm_host_cooked.name }}."
 
   - when: installer_manual_steps_msg is defined
     pause:
@@ -75,7 +75,7 @@
 
   - name: wait for installer to finish or crash
     wait_for_virt:
-      name: "{{ install_hostname }}"
+      name: "{{ inventory_hostname }}"
       states: shutdown,crashed
       timeout: 1800
     register: installer_result