Add iscsi option to govcloud platform

coreos · Jan 16, 2018 · 3c17ba9 · 3c17ba9
1 parent 5613b56
commit 3c17ba9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/examples/terraform.tfvars.govcloud b/examples/terraform.tfvars.govcloud
@@ -257,6 +257,9 @@ tectonic_govcloud_worker_root_volume_size = "30"
 // The type of volume for the root block device of worker nodes.
 tectonic_govcloud_worker_root_volume_type = "gp2"
 
+// (optional) Start iscsid.service to enable iscsi volume attachment.
+// tectonic_iscsi_enabled = "false"
+
 // The path to the tectonic licence file.
 // You can download the Tectonic license file from your Account overview page at [1].
 // 

diff --git a/modules/govcloud/master-asg/variables.tf b/modules/govcloud/master-asg/variables.tf
@@ -147,3 +147,7 @@ variable "dns_server_ip" {
   type    = "string"
   default = ""
 }
+
+variable "ign_iscsi_service_id" {
+  type = "string"
+}
diff --git a/modules/govcloud/worker-asg/variables.tf b/modules/govcloud/worker-asg/variables.tf
@@ -91,3 +91,7 @@ variable "dns_server_ip" {
   type    = "string"
   default = ""
 }
+
+variable "ign_iscsi_service_id" {
+  type = "string"
+}
diff --git a/modules/openstack/nodes/variables.tf b/modules/openstack/nodes/variables.tf
@@ -47,3 +47,7 @@ variable "ign_tectonic_path_unit_id" {
   type    = "string"
   default = ""
 }
+
+variable "ign_iscsi_service_id" {
+  type = "string"
+}
diff --git a/platforms/govcloud/main.tf b/platforms/govcloud/main.tf
@@ -111,6 +111,7 @@ module "ignition_masters" {
   etcd_tls_enabled          = "${var.tectonic_etcd_tls_enabled}"
   image_re                  = "${var.tectonic_image_re}"
   ingress_ca_cert_pem       = "${module.ingress_certs.ca_cert_pem}"
+  iscsi_enabled             = "${var.tectonic_iscsi_enabled}"
   kube_ca_cert_pem          = "${module.kube_certs.ca_cert_pem}"
   kube_dns_service_ip       = "${module.bootkube.kube_dns_service_ip}"
   kubeconfig_fetch_cmd      = "/opt/s3-puller.sh ${aws_s3_bucket_object.kubeconfig.bucket}/${aws_s3_bucket_object.kubeconfig.key} /etc/kubernetes/kubeconfig"
@@ -140,6 +141,7 @@ module "masters" {
   ign_init_assets_service_id           = "${module.ignition_masters.init_assets_service_id}"
   ign_installer_kubelet_env_id         = "${module.ignition_masters.installer_kubelet_env_id}"
   ign_installer_runtime_mappings_id    = "${module.ignition_masters.installer_runtime_mappings_id}"
+  ign_iscsi_service_id                 = "${module.ignition_masters.iscsi_service_id}"
   ign_k8s_node_bootstrap_service_id    = "${module.ignition_masters.k8s_node_bootstrap_service_id}"
   ign_kubelet_service_id               = "${module.ignition_masters.kubelet_service_id}"
   ign_locksmithd_service_id            = "${module.ignition_masters.locksmithd_service_id}"
@@ -175,6 +177,7 @@ module "ignition_workers" {
   etcd_ca_cert_pem        = "${module.etcd_certs.etcd_ca_crt_pem}"
   image_re                = "${var.tectonic_image_re}"
   ingress_ca_cert_pem     = "${module.ingress_certs.ca_cert_pem}"
+  iscsi_enabled           = "${var.tectonic_iscsi_enabled}"
   kube_ca_cert_pem        = "${module.kube_certs.ca_cert_pem}"
   kube_dns_service_ip     = "${module.bootkube.kube_dns_service_ip}"
   kubeconfig_fetch_cmd    = "/opt/s3-puller.sh ${aws_s3_bucket_object.kubeconfig.bucket}/${aws_s3_bucket_object.kubeconfig.key} /etc/kubernetes/kubeconfig"
@@ -197,6 +200,7 @@ module "workers" {
   ign_docker_dropin_id                 = "${module.ignition_workers.docker_dropin_id}"
   ign_installer_kubelet_env_id         = "${module.ignition_workers.installer_kubelet_env_id}"
   ign_installer_runtime_mappings_id    = "${module.ignition_workers.installer_runtime_mappings_id}"
+  ign_iscsi_service_id                 = "${module.ignition_workers.iscsi_service_id}"
   ign_k8s_node_bootstrap_service_id    = "${module.ignition_workers.k8s_node_bootstrap_service_id}"
   ign_kubelet_service_id               = "${module.ignition_workers.kubelet_service_id}"
   ign_locksmithd_service_id            = "${module.ignition_workers.locksmithd_service_id}"

diff --git a/platforms/metal/matchers.tf b/platforms/metal/matchers.tf
@@ -61,7 +61,7 @@ resource "matchbox_group" "controller" {
   metadata {
     domain_name        = "${element(var.tectonic_metal_controller_domains, count.index)}"
     etcd_enabled       = "${length(compact(var.tectonic_etcd_servers)) != 0 ? "false" : "true"}"
-    iscsi_enabled      = "${var.iscsi_enabled ? true : false}"
+    iscsi_enabled      = "${var.tectonic_iscsi_enabled ? true : false}"
     ssh_authorized_key = "${var.tectonic_ssh_authorized_key}"
 
     ign_bootkube_path_unit_json            = "${jsonencode(module.bootkube.systemd_path_unit_rendered)}"
@@ -109,7 +109,7 @@ resource "matchbox_group" "worker" {
 
   metadata {
     domain_name        = "${element(var.tectonic_metal_worker_domains, count.index)}"
-    iscsi_enabled      = "${var.iscsi_enabled ? true : false}"
+    iscsi_enabled      = "${var.tectonic_iscsi_enabled ? true : false}"
     ssh_authorized_key = "${var.tectonic_ssh_authorized_key}"
 
     # extra data