From 853cd90148c481747c708e5c2e932d5b4ce7898f Mon Sep 17 00:00:00 2001 From: rblundon Date: Mon, 22 Sep 2025 20:10:22 -0500 Subject: [PATCH] upsate ssh --- ansible/host_vars/space-mountain/vars | 3 ++- ansible/host_vars/splash-mountain/vars | 5 +++-- infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data | 2 ++ .../04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkr.hcl | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ansible/host_vars/space-mountain/vars b/ansible/host_vars/space-mountain/vars index 0d4aa60..2052b85 100644 --- a/ansible/host_vars/space-mountain/vars +++ b/ansible/host_vars/space-mountain/vars @@ -13,6 +13,7 @@ proxmox_clone_node: "fantasyland" # Templates are named in the following format (all lower case): -- # Current OS offerings are: +# - Ubuntu (24.04) # - Fedora (42) # Current VM sizes are: # - Small: 2 cores, 2GB memory, 8 GiB virtual disk @@ -21,7 +22,7 @@ proxmox_clone_node: "fantasyland" # - Large Plus: 4 cores, 4GB memory, 48 GiB virtual disk # - Xlarge: 4 cores, 8GB memory, 64 GiB virtual disk -vm_clone_source: "fedora-42-large-plus" +vm_clone_source: "ubuntu-24.04-large-plus" # Proxmox storage target. diff --git a/ansible/host_vars/splash-mountain/vars b/ansible/host_vars/splash-mountain/vars index 5ee0af0..42a361a 100644 --- a/ansible/host_vars/splash-mountain/vars +++ b/ansible/host_vars/splash-mountain/vars @@ -13,6 +13,7 @@ proxmox_clone_node: "fantasyland" # Templates are named in the following format (all lower case): -- # Current OS offerings are: +# - Ubuntu (24.04) # - Fedora (42) # Current VM sizes are: # - Small: 2 cores, 2GB memory, 8 GiB virtual disk @@ -21,11 +22,11 @@ proxmox_clone_node: "fantasyland" # - Large Plus: 4 cores, 4GB memory, 48 GiB virtual disk # - Xlarge: 4 cores, 8GB memory, 64 GiB virtual disk -vm_clone_source: "fedora-42-large-plus" +vm_clone_source: "ubuntu-24.04-large-plus" # Proxmox storage target. -vm_storage: "mk-general" +vm_storage: "general" # Proxmox does not yet do dynamic load balancing, the host target sets the target for HA groups # and backup groups. (ha_group will be factored out in the next functionality update.) diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data b/infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data index 059cf71..785f49a 100644 --- a/infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data +++ b/infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data @@ -12,6 +12,8 @@ autoinstall: # ssh_quiet_keygen: true # allow_public_ssh_keys: true + ssh_pwauth: true + locale: en_US.UTF-8 keyboard: layout: us diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkr.hcl b/infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkr.hcl index 5b2a8fb..ecab651 100755 --- a/infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkr.hcl +++ b/infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkr.hcl @@ -92,9 +92,9 @@ source "proxmox-iso" "ubuntu-2404" { username = "${var.proxmox_username}" password = "${var.proxmox_password}" proxmox_url = "https://${var.proxmox_node}.${var.proxmox_domain}:8006/api2/json" - ssh_timeout = "120m" + ssh_timeout = "15m" ssh_username = "${var.ssh_username}" -# ssh_password = "${var.ssh_password}" + ssh_password = "${var.ssh_password}" ssh_private_key_file = "${var.ssh_private_key}" template_description = "Ubuntu 24.04.3, generated on ${timestamp()}" template_name = "${var.vm_name}"