vmware: add tectonic_ssh_private_key variable (#995)

Follow up on #625 for VMware platform
coreos · Jun 7, 2017 · 8f04b18 · 8f04b18
1 parent 6c75bfb
commit 8f04b18
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/Documentation/variables/vmware.md b/Documentation/variables/vmware.md
@@ -26,6 +26,7 @@ This document gives an overview of variables used in the VMware platform of the
 | tectonic_vmware_node_dns | DNS Server to be useddd by Virtual Machine(s) | string | - |
 | tectonic_vmware_server | vCenter Server IP/FQDN | string | - |
 | tectonic_vmware_ssh_authorized_key | SSH public key to use as an authorized key. Example: `"ssh-rsa AAAB3N..."` | string | - |
+| tectonic_vmware_ssh_private_key_path | SSH private key file corresponding to tectonic_vmware_ssh_authorized_key. If not provided, SSH agent will be used. | string | `` |
 | tectonic_vmware_sslselfsigned | Is the vCenter certificate Self-Signed? Example: `tectonic_vmware_sslselfsigned = "true"` | string | - |
 | tectonic_vmware_vm_template | Virtual Machine template of CoreOS Container Linux. | string | - |
 | tectonic_vmware_vm_template_folder | Folder for VM template of CoreOS Container Linux. | string | - |

diff --git a/examples/terraform.tfvars.vmware b/examples/terraform.tfvars.vmware
@@ -182,6 +182,9 @@ tectonic_vmware_server = ""
 // SSH public key to use as an authorized key. Example: `"ssh-rsa AAAB3N..."`
 tectonic_vmware_ssh_authorized_key = ""
 
+// SSH private key file corresponding to tectonic_vmware_ssh_authorized_key. If not provided, SSH agent will be used.
+tectonic_vmware_ssh_private_key_path = ""
+
 // Is the vCenter certificate Self-Signed? Example: `tectonic_vmware_sslselfsigned = "true"`
 tectonic_vmware_sslselfsigned = ""
 

diff --git a/modules/vmware/node/nodes.tf b/modules/vmware/node/nodes.tf
@@ -24,8 +24,9 @@ resource "vsphere_virtual_machine" "node" {
   }
 
   connection {
-    type = "ssh"
-    user = "core"
+    type        = "ssh"
+    user        = "core"
+    private_key = "${file(var.tectonic_vmware_ssh_private_key_path != "" ? pathexpand(var.tectonic_vmware_ssh_private_key_path) : "/dev/null")}"
   }
 
   provisioner "file" {

diff --git a/platforms/vmware/remote.tf b/platforms/vmware/remote.tf
@@ -2,10 +2,11 @@ resource "null_resource" "bootstrap" {
   # Without depends_on, this remote-exec may start before the kubeconfig copy.  # Terraform only does one task at a time, so it would try to bootstrap  # Kubernetes and Tectonic while no Kubelets are running. Ensure all nodes  # receive a kubeconfig before proceeding with bootkube and tectonic.  #depends_on = ["null_resource.kubeconfig-masters"]
 
   connection {
-    type    = "ssh"
-    host    = "${module.masters.ip_address[0]}"
-    user    = "core"
-    timeout = "60m"
+    type        = "ssh"
+    host        = "${module.masters.ip_address[0]}"
+    user        = "core"
+    timeout     = "60m"
+    private_key = "${file(var.tectonic_vmware_ssh_private_key_path != "" ? pathexpand(var.tectonic_vmware_ssh_private_key_path) : "/dev/null")}"
   }
 
   provisioner "file" {

diff --git a/platforms/vmware/variables.tf b/platforms/vmware/variables.tf
@@ -52,6 +52,12 @@ variable "tectonic_vmware_ssh_authorized_key" {
   description = "SSH public key to use as an authorized key. Example: `\"ssh-rsa AAAB3N...\"`"
 }
 
+variable "tectonic_vmware_ssh_private_key_path" {
+  type        = "string"
+  description = "SSH private key file corresponding to tectonic_vmware_ssh_authorized_key. If not provided, SSH agent will be used."
+  default     = ""
+}
+
 variable "tectonic_vmware_node_dns" {
   type        = "string"
   description = "DNS Server to be useddd by Virtual Machine(s)"