added logic to support user supplied ssh keyname (or not) for gcp

gcp/gcp-instance.tf

@@ -12,13 +12,17 @@ resource "google_compute_address" "ph-public-ip" {
   depends_on                        = [google_project_service.ph-project-services]
 }
 
+locals {
+  ssh_key_formatted                 = length(split(" ", var.ssh_key)) == 3 ? var.ssh_key : "${var.ssh_key} ubuntu"
+}
+
 resource "google_compute_instance" "ph-instance" {
   name                              = "${var.ph_prefix}-instance"
   zone                              = "${var.gcp_region}-${var.gcp_zone}"
   machine_type                      = var.gcp_machine_type
   project                           = google_project.ph-project.project_id
   metadata                          = {
-    ssh-keys                          = "${var.ssh_user}:${var.ssh_key} ${var.ssh_user}"
+    ssh-keys                          = "${var.ssh_user}:${local.ssh_key_formatted}"
     startup-script                    = "# Disable systemd resolve\nDNS_SERVER='169.254.169.254'\nDNS_SEARCH=$(grep '^search ' /etc/resolv.conf)\nsystemctl disable systemd-resolved\nsystemctl stop systemd-resolved\nrm -f /etc/resolv.conf\ntee /etc/resolv.conf << EOM\nnameserver $DNS_SERVER\noptions edns0\n$DNS_SEARCH\nEOM\n\ntee /etc/systemd/system/cloudblock-ansible-state.service << EOM\n[Unit]\nDescription=cloudblock-ansible-state\nAfter=network.target\n\n[Service]\nExecStart=/opt/cloudblock-ansible-state.sh\nType=simple\nRestart=on-failure   \nRestartSec=30\n\n[Install]\nWantedBy=multi-user.target\nEOM\n\n# Create systemd timer unit file\ntee /etc/systemd/system/cloudblock-ansible-state.timer << EOM\n[Unit]\nDescription=Starts cloudblock ansible state playbook 1min after boot\n\n[Timer]\nOnBootSec=1mi\nnUnit=cloudblock-ansible-state.service\n\n[Install]\nWantedBy=multi-user.target\nEOM\n\n# Create cloudblock-ansible-state script\ntee /opt/cloudblock-ansible-state.sh << EOM\n#!/bin/bash\n# package update\napt-get update\n# install prereqs\nDEBIAN_FRONTEND=noninteractive apt-get -y install python3-pip git\npip3 install --upgrade pip\n# use pip to install ansible\npip3 install --upgrade ansible\n# make the project directory and clone/pull the project\nmkdir -p /opt/cloudblock\ngit clone ${var.project_url} /opt/cloudblock/\ncd /opt/cloudblock/\ngit pull\ncd playbooks/\n# run the playbook\nansible-playbook cloudblock_gcp.yml --extra-vars 'docker_network=${var.docker_network} docker_gw=${var.docker_gw} docker_doh=${var.docker_doh} docker_pihole=${var.docker_pihole} docker_wireguard=${var.docker_wireguard} docker_webproxy=${var.docker_webproxy} wireguard_network=${var.wireguard_network} doh_provider=${var.doh_provider} dns_novpn=1 gcp_project_prefix=${var.ph_prefix} gcp_project_suffix=${random_string.ph-random.result} wireguard_peers=${var.wireguard_peers} vpn_traffic=${var.vpn_traffic}' >> /var/log/cloudblock.log\nEOM\n\n# Start / Enable cloudblock-ansible-state\nchmod +x /opt/cloudblock-ansible-state.sh\nsystemctl daemon-reload\nsystemctl start cloudblock-ansible-state.timer\nsystemctl start cloudblock-ansible-state.service\nsystemctl enable cloudblock-ansible-state.timer\nsystemctl enable cloudblock-ansible-state.service"
   }
   boot_disk {