From 08be513b9bd3d41a69b9ea1009694fa7bc4f8876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= <me@rgoncalves.se>
Date: Tue, 14 Dec 2021 16:55:22 +0000
Subject: roles/vmm: Remove extra lookup for password location
---
roles/vmm/defaults/main.yml | 2 +-
roles/vmm/templates/autoinstall.conf.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/vmm/defaults/main.yml b/roles/vmm/defaults/main.yml
index 5ba92c6..91bae08 100644
--- a/roles/vmm/defaults/main.yml
+++ b/roles/vmm/defaults/main.yml
@@ -7,7 +7,7 @@ vmm_configuration_file: /etc/vm.conf
vmm_default_timezone: Europe/Stockholm
vmm_default_fallback_http: true
-vmm_default_password: "{{ lookup('password', lookup('env', 'PWD') ~ '/files/secrets/hosts/default/root-password') }}"
+vmm_default_password: "{{ lookup('password', 'files/secrets/hosts/default/root@system.password') }}"
vmm_default_ssh_key: "{{ lookup('file', lookup('env', 'PWD') ~ '/files/keys/rgoncalves.pub') }}"
vmm_image_openbsd_kernel_prefix: /bsd.vmm
diff --git a/roles/vmm/templates/autoinstall.conf.j2 b/roles/vmm/templates/autoinstall.conf.j2
index af6506e..440cc8b 100644
--- a/roles/vmm/templates/autoinstall.conf.j2
+++ b/roles/vmm/templates/autoinstall.conf.j2
@@ -6,7 +6,7 @@ Default IPv4 route = {{ ansible_default_ipv4.gateway }}
DNS domain name = {{ __global_domain_name_hosts }}.{{ __global_domain_name }}
DNS nameservers = {{ __global_domain_name_servers | join (" ") }}
Do you expect to run the X Window System = no
-Password for root = {{ lookup('password', lookup('env', 'PWD') ~ '/files/secrets/hosts/' ~ host.inventory_hostname ~ '/root-password') }}"
+Password for root = {{ lookup('password', 'files/secrets/hosts/' ~ host.inventory_hostname ~ '/root@system.password') }}
Public ssh key for root account = {{ vmm_default_ssh_key }}
Which disk is the root disk = sd0
URL to autopartitioning template for disklabel = http://{{ ansible_default_ipv4.address }}/{{ item.lladdr }}-disklabel.conf
--
cgit v1.2.3