From 17077868e615fa7115abdb03a5af4662ab0a3679 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 23 Apr 2020 01:24:38 +0200
Subject: refactor all install roles ans playbooks to work with new variable
 install_hostname

---
 .../openbsd/autoinstall/templates/auto_install.conf.j2   | 16 ++++++++--------
 .../openbsd/autoinstall/templates/install.site.j2        |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'roles/installer/openbsd/autoinstall/templates')

diff --git a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2 b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
index 18e85a80..4220be38 100644
--- a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
+++ b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
@@ -1,15 +1,15 @@
-System hostname = {{ hostvars[hostname].host_name }}
+System hostname = {{ hostvars[install_hostname].host_name }}
 
-Which network interface do you wish to configure = {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
-{% if 'install_dhcp' in hostvars[hostname] and hostvars[hostname].install_dhcp %}
+Which network interface do you wish to configure = {{ install_interface | default(hostvars[install_hostname].network_cooked.primary.interface) }}
+{% if 'install_dhcp' in hostvars[install_hostname] and hostvars[install_hostname].install_dhcp %}
 IPv4 address = dhcp
 {% else %}
-IPv4 address = {{ hostvars[hostname].network_cooked.primary.ip }}
-Netmask = {{ hostvars[hostname].network_cooked.primary.mask }}
-Default IPv4 route = {{ hostvars[hostname].network_cooked.primary.gateway }}
+IPv4 address = {{ hostvars[install_hostname].network_cooked.primary.ip }}
+Netmask = {{ hostvars[install_hostname].network_cooked.primary.mask }}
+Default IPv4 route = {{ hostvars[install_hostname].network_cooked.primary.gateway }}
 {% endif %}
-DNS domain name = {{ hostvars[hostname].network_cooked.domain }}
-DNS nameservers = {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
+DNS domain name = {{ hostvars[install_hostname].network_cooked.domain }}
+DNS nameservers = {{ hostvars[install_hostname].network_cooked.nameservers | join(' ') }}
 
 {% if obsd_autoinstall_serial_device is defined %}
 Change the default console to {{ obsd_autoinstall_serial_device }} = yes
diff --git a/roles/installer/openbsd/autoinstall/templates/install.site.j2 b/roles/installer/openbsd/autoinstall/templates/install.site.j2
index 82928daa..974b516a 100644
--- a/roles/installer/openbsd/autoinstall/templates/install.site.j2
+++ b/roles/installer/openbsd/autoinstall/templates/install.site.j2
@@ -8,9 +8,9 @@ cat <<EOF > /root/.ssh/authorized_keys
 {{ ssh_keys_root | join('\n') }}
 EOF
 
-{% if hostvars[hostname].ansible_port is defined %}
-echo "Setting SSH port to {{ hostvars[hostname].ansible_port }}"
-sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config
+{% if hostvars[install_hostname].ansible_port is defined %}
+echo "Setting SSH port to {{ hostvars[install_hostname].ansible_port }}"
+sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[install_hostname].ansible_port }}/' -i /etc/ssh/sshd_config
 {% endif %}
 
 echo "Installing python"
-- 
cgit v1.2.3