Merge pull request #108 from detiber/updateImages

Update component image versions to latest

deploy/compose/.env

@@ -1,10 +1,10 @@
 #OSIE_DOWNLOAD_URLS="https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/osie-1790-23d78ea47f794d0e5c934b604579c26e5fce97f5.tar.gz"
 OSIE_DOWNLOAD_URLS="https://github.com/tinkerbell/hook/releases/download/5.10.57/hook_x86_64.tar.gz,https://github.com/tinkerbell/hook/releases/download/5.10.57/hook_aarch64.tar.gz"
 TINKERBELL_USE_HOOK="true"
-TINK_CLI_IMAGE="quay.io/tinkerbell/tink-cli:sha-8ea8a0e5"
-TINK_SERVER_IMAGE="quay.io/tinkerbell/tink:sha-8ea8a0e5"
-BOOTS_SERVER_IMAGE="quay.io/tinkerbell/boots:sha-94f43947"
-HEGEL_SERVER_IMAGE="quay.io/tinkerbell/hegel:sha-9f5da0a8"
+TINK_CLI_IMAGE="quay.io/tinkerbell/tink-cli:sha-3743d31e"
+TINK_SERVER_IMAGE="quay.io/tinkerbell/tink:sha-3743d31e"
+BOOTS_SERVER_IMAGE="quay.io/tinkerbell/boots:sha-36f12f81"
+HEGEL_SERVER_IMAGE="quay.io/tinkerbell/hegel:sha-89cb9dc8"
 TINKERBELL_HARDWARE_MANIFEST="/manifests/hardware/hardware.json"
 TINKERBELL_TEMPLATE_MANIFEST="/manifests/template/ubuntu.yaml"
 TINKERBELL_HOST_IP=192.168.50.4

deploy/terraform/main.tf

@@ -85,7 +85,8 @@ resource "null_resource" "setup" {
     type        = "ssh"
     user        = "root"
     host        = metal_device.tink_provisioner.network[0].address
-    private_key = file("~/.ssh/id_rsa")
+    agent       = var.use_ssh_agent
+    private_key = var.use_ssh_agent ? null : file(var.ssh_private_key)
   }
 
   # need to tar the compose directory because the 'provisioner "file"' does not preserve file permissions

deploy/terraform/variables.tf

@@ -19,3 +19,15 @@ variable "device_type" {
   description = "Type of device to provision"
   default     = "c3.small.x86"
 }
+
+variable "use_ssh_agent" {
+  type        = bool
+  description = "Use ssh agent to connect to provisioner machine"
+  default     = false
+}
+
+variable "ssh_private_key" {
+  type        = string
+  description = "ssh private key file to use"
+  default     = "~/.ssh/id_rsa"
+}

deploy/vagrant/Vagrantfile

@@ -16,6 +16,10 @@ unless Vagrant.has_plugin?("vagrant-docker-compose")
 end
 
 Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.qemu_use_session = false
+  end
+
   config.vm.define "provisioner" do |provisioner|
     provisioner.vm.box = "generic/ubuntu2004"
     provisioner.vm.synced_folder '../', '/vagrant'