add region config for machine api operator

openshift · Aug 10, 2018 · d4738f2 · d4738f2
1 parent dfd1485
commit d4738f2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 0 deletions.
diff --git a/modules/bootkube/manifests.tf b/modules/bootkube/manifests.tf
@@ -69,6 +69,7 @@ data "template_file" "manifest_file_list" {
     cluster_name      = "${var.cluster_name}"
     cluster_domain    = "${var.base_domain}"
     ssh_key           = "${var.ssh_key}"
+    region            = "${var.region}"
   }
 }
 

diff --git a/modules/bootkube/resources/manifests/mao-config.yaml b/modules/bootkube/resources/manifests/mao-config.yaml
@@ -7,6 +7,7 @@ data:
     sshKey: ${ssh_key}
     clusterName: ${cluster_name}
     clusterDomain: ${cluster_domain}
+    region: ${region}
 metadata:
   name: mao-config-v1
   namespace: kube-system

diff --git a/modules/bootkube/variables.tf b/modules/bootkube/variables.tf
@@ -174,3 +174,7 @@ variable "base_domain" {
 variable "ssh_key" {
   type = "string"
 }
+
+variable "region" {
+  type = "string"
+}
diff --git a/steps/assets/aws/main.tf b/steps/assets/aws/main.tf
@@ -35,6 +35,7 @@ module assets_base {
   tectonic_update_channel          = "${var.tectonic_update_channel}"
   tectonic_versions                = "${var.tectonic_versions}"
   ssh_key                          = "${var.tectonic_aws_ssh_key}"
+  region                           = "${var.tectonic_aws_region}"
 }
 
 # Removing assets is platform-specific

diff --git a/steps/assets/base/tectonic.tf b/steps/assets/base/tectonic.tf
@@ -54,6 +54,7 @@ module "bootkube" {
   worker_ign_config = "${file("worker.ign")}"
   base_domain       = "${var.tectonic_base_domain}"
   ssh_key           = "${var.ssh_key}"
+  region            = "${var.region}"
 }
 
 module "tectonic" {

diff --git a/steps/assets/base/variables.tf b/steps/assets/base/variables.tf
@@ -16,3 +16,8 @@ variable "ssh_key" {
   type    = "string"
   default = ""
 }
+
+variable "region" {
+  type    = "string"
+  default = ""
+}