platforms/azure: added ssh key to etcd (#557)

coreos · May 10, 2017 · dc30418 · dc30418
1 parent 8882b6b
commit dc30418
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/modules/azure/etcd/etcd.tf b/modules/azure/etcd/etcd.tf
@@ -30,12 +30,17 @@ resource "azurerm_virtual_machine" "etcd_node" {
   os_profile {
     computer_name  = "etcd"
     admin_username = "core"
-    admin_password = "Microsoft123!"
+    admin_password = ""
     custom_data    = "${base64encode("${data.ignition_config.etcd.*.rendered[count.index]}")}"
   }
 
   os_profile_linux_config {
-    disable_password_authentication = false
+    disable_password_authentication = true
+
+    ssh_keys {
+      path     = "/home/core/.ssh/authorized_keys"
+      key_data = "${file(var.public_ssh_key)}"
+    }
   }
 }
 

diff --git a/modules/azure/etcd/ignition.tf b/modules/azure/etcd/ignition.tf
@@ -15,7 +15,7 @@ data "ignition_user" "core" {
   name = "core"
 
   ssh_authorized_keys = [
-    "${file(var.ssh_key)}",
+    "${file(var.public_ssh_key)}",
   ]
 }
 

diff --git a/modules/azure/etcd/variables.tf b/modules/azure/etcd/variables.tf
@@ -33,7 +33,7 @@ variable "cluster_name" {
   type = "string"
 }
 
-variable "ssh_key" {
+variable "public_ssh_key" {
   type = "string"
 }
 

diff --git a/platforms/azure/main.tf b/platforms/azure/main.tf
@@ -29,7 +29,7 @@ module "etcd" {
   etcd_count      = "${var.tectonic_etcd_count}"
   base_domain     = "${var.tectonic_base_domain}"
   cluster_name    = "${var.tectonic_cluster_name}"
-  ssh_key         = "${var.tectonic_azure_ssh_key}"
+  public_ssh_key  = "${var.tectonic_azure_ssh_key}"
   virtual_network = "${module.vnet.vnet_id}"
   subnet          = "${module.vnet.master_subnet}"
 }

diff --git a/platforms/azure/tectonic.tf b/platforms/azure/tectonic.tf
@@ -36,6 +36,8 @@ module "tectonic" {
   source   = "../../modules/tectonic"
   platform = "azure"
 
+  master_count = "${var.tectonic_master_count}"
+
   base_address       = "${var.tectonic_azure_use_custom_fqdn == "true" ? "${var.tectonic_cluster_name}.${var.tectonic_base_domain}" : module.masters.ingress_internal_fqdn}"
   kube_apiserver_url = "${var.tectonic_azure_use_custom_fqdn == "true" ? "https://${var.tectonic_cluster_name}-k8s.${var.tectonic_base_domain}:443" : "https://${module.masters.api_internal_fqdn}:443"}"