refactor all install roles ans playbooks to work with new variable install_hostname

1 files changed, 51 insertions, 51 deletions

diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-eoan-desktop-with-raid.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-eoan-desktop-with-raid.cfg.j2
index 262f4ed0..b0d5a18d 100644
--- a/roles/installer/debian/preseed/templates/preseed_xubuntu-eoan-desktop-with-raid.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-eoan-desktop-with-raid.cfg.j2
@@ -19,29 +19,29 @@ d-i hw-detect/load_firmware boolean false
 {% if preseed_no_netplan %}
 d-i netcfg/do_not_use_netplan boolean true
 {% endif %}
-d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
-{% if 'install_dhcp' in hostvars[hostname] and hostvars[hostname].install_dhcp %}
+d-i netcfg/choose_interface select {{ install_interface | default(hostvars[install_hostname].network_cooked.primary.interface) }}
+{% if 'install_dhcp' in hostvars[install_hostname] and hostvars[install_hostname].install_dhcp %}
 d-i netcfg/disable_dhcp boolean false
 d-i netcfg/disable_autoconfig boolean false
 {% else %}
 d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
-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/get_ipaddress string {{ hostvars[install_hostname].network_cooked.primary.ip }}
+d-i netcfg/get_netmask string {{ hostvars[install_hostname].network_cooked.primary.mask }}
+d-i netcfg/get_gateway string {{ hostvars[install_hostname].network_cooked.primary.gateway }}
+d-i netcfg/get_nameservers string {{ hostvars[install_hostname].network_cooked.nameservers | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
-d-i netcfg/hostname string {{ hostvars[hostname].host_name }}
-d-i netcfg/get_hostname string {{ hostvars[hostname].host_name }}
-d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
-d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
+d-i netcfg/hostname string {{ hostvars[install_hostname].host_name }}
+d-i netcfg/get_hostname string {{ hostvars[install_hostname].host_name }}
+d-i netcfg/domain string {{ hostvars[install_hostname].network_cooked.domain }}
+d-i netcfg/get_domain string {{ hostvars[install_hostname].network_cooked.domain }}
 d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string {{ apt_repo_providers[(hostvars[hostname].apt_repo_provider | default('default'))].ubuntu }}
+d-i mirror/http/hostname string {{ apt_repo_providers[(hostvars[install_hostname].apt_repo_provider | default('default'))].ubuntu }}
 d-i mirror/http/directory string /ubuntu
 d-i mirror/http/proxy string
 
@@ -60,7 +60,7 @@ d-i partman-auto/disk string /dev/sda /dev/sdb
 
 d-i partman-auto/method string raid
 d-i partman-auto/purge_lvm_from_device boolean true
-d-i partman-auto-lvm/new_vg_name string {{ hostvars[hostname].host_name }}
+d-i partman-auto-lvm/new_vg_name string {{ hostvars[install_hostname].host_name }}
 d-i partman-auto-lvm/guided_size string max
 
 d-i partman-lvm/device_remove_lvm boolean true
@@ -73,41 +73,41 @@ d-i partman-lvm/confirm_nooverwrite boolean true
 d-i partman/choose_label string dos
 d-i partman/default_label string dos
 d-i partman-auto/choose_recipe select boot-root
-d-i partman-auto/expert_recipe string                                    \
-      boot-root ::                                                       \
-              256 512 256 raid                                           \
-                      $lvmignore{ } $primary{ } method{ raid }           \
-              .                                                          \
-              1000 10000 -1 raid                                         \
-                      $lvmignore{ } $primary{ } method{ raid }           \
-              .                                                          \
-              15360 10000 20480 ext4                                     \
-                      $defaultignore{ } $lvmok{ }                        \
-                      in_vg{ {{ hostvars[hostname].host_name }} }        \
-                      method{ format } format{ }                         \
-                      use_filesystem{ } filesystem{ ext4 }               \
-                      mountpoint{ / }                                    \
-              .                                                          \
-              768 10000 768 ext4                                         \
-                      $defaultignore{ } $lvmok{ }                        \
-                      in_vg{ {{ hostvars[hostname].host_name }} }        \
-                      method{ format } format{ }                         \
-                      use_filesystem{ } filesystem{ ext4 }               \
-                      mountpoint{ /var/log }                             \
-                      options/nodev{ nodev } options/noatime{ noatime }  \
-                      options/noexec{ noexec }                           \
-              .                                                          \
-              20480 10000 20480 ext4                                     \
-                      $defaultignore{ } $lvmok{ }                        \
-                      in_vg{ {{ hostvars[hostname].host_name }} }        \
-                      method{ format } format{ }                         \
-                      use_filesystem{ } filesystem{ ext4 }               \
-                      mountpoint{ /home }                                \
-              .                                                          \
-              16 20000 -1 ext4                                           \
-                      $defaultignore{ } $lvmok{ }                        \
-                      in_vg{ {{ hostvars[hostname].host_name }} }        \
-                      lv_name{ dummy }                                   \
+d-i partman-auto/expert_recipe string                                     \
+      boot-root ::                                                        \
+              256 512 256 raid                                            \
+                      $lvmignore{ } $primary{ } method{ raid }            \
+              .                                                           \
+              1000 10000 -1 raid                                          \
+                      $lvmignore{ } $primary{ } method{ raid }            \
+              .                                                           \
+              15360 10000 20480 ext4                                      \
+                      $defaultignore{ } $lvmok{ }                         \
+                      in_vg{ {{ hostvars[install_hostname].host_name }} } \
+                      method{ format } format{ }                          \
+                      use_filesystem{ } filesystem{ ext4 }                \
+                      mountpoint{ / }                                     \
+              .                                                           \
+              768 10000 768 ext4                                          \
+                      $defaultignore{ } $lvmok{ }                         \
+                      in_vg{ {{ hostvars[install_hostname].host_name }} } \
+                      method{ format } format{ }                          \
+                      use_filesystem{ } filesystem{ ext4 }                \
+                      mountpoint{ /var/log }                              \
+                      options/nodev{ nodev } options/noatime{ noatime }   \
+                      options/noexec{ noexec }                            \
+              .                                                           \
+              20480 10000 20480 ext4                                      \
+                      $defaultignore{ } $lvmok{ }                         \
+                      in_vg{ {{ hostvars[install_hostname].host_name }} } \
+                      method{ format } format{ }                          \
+                      use_filesystem{ } filesystem{ ext4 }                \
+                      mountpoint{ /home }                                 \
+              .                                                           \
+              16 20000 -1 ext4                                            \
+                      $defaultignore{ } $lvmok{ }                         \
+                      in_vg{ {{ hostvars[install_hostname].host_name }} } \
+                      lv_name{ dummy }                                    \
               .
 
 d-i partman-auto-raid/recipe string \
@@ -126,7 +126,7 @@ d-i partman/confirm_nooverwrite boolean true
 
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string {{ apt_repo_providers[(hostvars[hostname].apt_repo_provider | default('default'))].ubuntu }}
+d-i apt-setup/security_host string {{ apt_repo_providers[(hostvars[install_hostname].apt_repo_provider | default('default'))].ubuntu }}
 
 tasksel tasksel/first multiselect xubuntu-desktop
 d-i pkgsel/include string openssh-server python python-apt ifupdown
@@ -145,7 +145,7 @@ d-i finish-install/reboot_in_progress note
 
 
 d-i preseed/late_command string \
-    lvremove -f {{ hostvars[hostname].host_name }}/dummy; \
+    lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \
     in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \
     in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
 {% if preseed_no_netplan %}
@@ -159,8 +159,8 @@ d-i preseed/late_command string \
     in-target bash -c "update-initramfs -u"; \
 {% endif %}
     in-target bash -c "passwd -d root && passwd -l root"; \
-{% 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"; \
+{% if hostvars[install_hostname].ansible_port is defined %}
+    in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[install_hostname].ansible_port }}/' -i /etc/ssh/sshd_config"; \
 {% endif %}
     mkdir -p -m 0700 /target/root/.ssh; \
     cp /authorized_keys /target/root/.ssh/