From 277b3476041fdeef01bffdc10487b9c5a6e2a718 Mon Sep 17 00:00:00 2001
From: rptaylor <rptaylor@uvic.ca>
Date: Tue, 18 Feb 2020 04:29:27 -0800
Subject: [PATCH] add az_list_node variable to specify different AZs for
kubelets (#5413)
* rebase and add az_list_node variable to specify different AZs for kubelets
* fix missing variable name change
---
contrib/terraform/openstack/kubespray.tf | 1 +
contrib/terraform/openstack/modules/compute/main.tf | 8 ++++----
.../terraform/openstack/modules/compute/variables.tf | 8 ++++++--
contrib/terraform/openstack/variables.tf | 12 +++++++++---
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/contrib/terraform/openstack/kubespray.tf b/contrib/terraform/openstack/kubespray.tf
index 95c95043e..33fbff762 100644
--- a/contrib/terraform/openstack/kubespray.tf
+++ b/contrib/terraform/openstack/kubespray.tf
@@ -32,6 +32,7 @@ module "compute" {
cluster_name = "${var.cluster_name}"
az_list = "${var.az_list}"
+ az_list_node = "${var.az_list_node}"
number_of_k8s_masters = "${var.number_of_k8s_masters}"
number_of_k8s_masters_no_etcd = "${var.number_of_k8s_masters_no_etcd}"
number_of_etcd = "${var.number_of_etcd}"
diff --git a/contrib/terraform/openstack/modules/compute/main.tf b/contrib/terraform/openstack/modules/compute/main.tf
index 11fae6617..8796c605a 100644
--- a/contrib/terraform/openstack/modules/compute/main.tf
+++ b/contrib/terraform/openstack/modules/compute/main.tf
@@ -546,7 +546,7 @@ resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip_no_etcd_cust
resource "openstack_compute_instance_v2" "k8s_node" {
name = "${var.cluster_name}-k8s-node-${count.index+1}"
count = "${var.node_root_volume_size_in_gb == 0 ? var.number_of_k8s_nodes : 0}"
- availability_zone = "${element(var.az_list, count.index)}"
+ availability_zone = "${element(var.az_list_node, count.index)}"
image_name = "${var.image}"
flavor_id = "${var.flavor_k8s_node}"
key_pair = "${openstack_compute_keypair_v2.k8s.name}"
@@ -581,7 +581,7 @@ resource "openstack_compute_instance_v2" "k8s_node" {
resource "openstack_compute_instance_v2" "k8s_node_custom_volume_size" {
name = "${var.cluster_name}-k8s-node-${count.index+1}"
count = "${var.node_root_volume_size_in_gb > 0 ? var.number_of_k8s_nodes : 0}"
- availability_zone = "${element(var.az_list, count.index)}"
+ availability_zone = "${element(var.az_list_node, count.index)}"
image_name = "${var.image}"
flavor_id = "${var.flavor_k8s_node}"
key_pair = "${openstack_compute_keypair_v2.k8s.name}"
@@ -625,7 +625,7 @@ resource "openstack_compute_instance_v2" "k8s_node_custom_volume_size" {
resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
name = "${var.cluster_name}-k8s-node-nf-${count.index+1}"
count = "${var.node_root_volume_size_in_gb == 0 ? var.number_of_k8s_nodes_no_floating_ip : 0}"
- availability_zone = "${element(var.az_list, count.index)}"
+ availability_zone = "${element(var.az_list_node, count.index)}"
image_name = "${var.image}"
flavor_id = "${var.flavor_k8s_node}"
key_pair = "${openstack_compute_keypair_v2.k8s.name}"
@@ -656,7 +656,7 @@ resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip_custom_volume_size" {
name = "${var.cluster_name}-k8s-node-nf-${count.index+1}"
count = "${var.node_root_volume_size_in_gb > 0 ? var.number_of_k8s_nodes_no_floating_ip : 0}"
- availability_zone = "${element(var.az_list, count.index)}"
+ availability_zone = "${element(var.az_list_node, count.index)}"
image_name = "${var.image}"
flavor_id = "${var.flavor_k8s_node}"
key_pair = "${openstack_compute_keypair_v2.k8s.name}"
diff --git a/contrib/terraform/openstack/modules/compute/variables.tf b/contrib/terraform/openstack/modules/compute/variables.tf
index 61108059f..4fab83c57 100644
--- a/contrib/terraform/openstack/modules/compute/variables.tf
+++ b/contrib/terraform/openstack/modules/compute/variables.tf
@@ -1,7 +1,11 @@
variable "cluster_name" {}
variable "az_list" {
- type = "list"
+ type = list(string)
+}
+
+variable "az_list_node" {
+ type = list(string)
}
variable "number_of_k8s_masters" {}
@@ -110,4 +114,4 @@ variable "use_access_ip" {}
variable "use_server_groups" {
type = bool
-}
\ No newline at end of file
+}
diff --git a/contrib/terraform/openstack/variables.tf b/contrib/terraform/openstack/variables.tf
index 1fd294aad..1ab16e5e9 100644
--- a/contrib/terraform/openstack/variables.tf
+++ b/contrib/terraform/openstack/variables.tf
@@ -3,8 +3,14 @@ variable "cluster_name" {
}
variable "az_list" {
- description = "List of Availability Zones available in your OpenStack cluster"
- type = "list"
+ description = "List of Availability Zones to use for masters in your OpenStack cluster"
+ type = list(string)
+ default = ["nova"]
+}
+
+variable "az_list_node" {
+ description = "List of Availability Zones to use for nodes in your OpenStack cluster"
+ type = list(string)
default = ["nova"]
}
@@ -213,4 +219,4 @@ variable "use_access_ip" {
variable "use_server_groups" {
default = false
-}
\ No newline at end of file
+}
--
GitLab