Merge pull request #3019 from holmsten/terraform-ops-worker-groups

[contrib/terraform/openstack] Add supplementary node groups
This commit is contained in:
Antoine Legrand
2018-08-16 16:06:53 +02:00
committed by GitHub
5 changed files with 13 additions and 2 deletions

View File

@@ -249,7 +249,7 @@ resource "openstack_compute_instance_v2" "k8s_node" {
metadata = {
ssh_user = "${var.ssh_user}"
kubespray_groups = "kube-node,k8s-cluster"
kubespray_groups = "kube-node,k8s-cluster,${var.supplementary_node_groups}"
depends_on = "${var.network_id}"
}
@@ -278,7 +278,7 @@ resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
metadata = {
ssh_user = "${var.ssh_user}"
kubespray_groups = "kube-node,k8s-cluster,no-floating"
kubespray_groups = "kube-node,k8s-cluster,no-floating,${var.supplementary_node_groups}"
depends_on = "${var.network_id}"
}

View File

@@ -63,3 +63,7 @@ variable "bastion_fips" {
variable "supplementary_master_groups" {
default = ""
}
variable "supplementary_node_groups" {
default = ""
}