From cf26585cff62b1f425ee9ec7ee0008da01c81feb Mon Sep 17 00:00:00 2001
From: Pablo Moreno <pablo.a.moreno@gmail.com>
Date: Thu, 2 Mar 2017 23:58:07 +0000
Subject: [PATCH] Restores working order of contrib/terraform/openstack,
includes vault group and avoids group_vars/k8s-cluster.yml
---
contrib/terraform/openstack/group_vars | 1 +
contrib/terraform/openstack/kubespray.tf | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
create mode 120000 contrib/terraform/openstack/group_vars
diff --git a/contrib/terraform/openstack/group_vars b/contrib/terraform/openstack/group_vars
new file mode 120000
index 000000000..d64da8dc6
--- /dev/null
+++ b/contrib/terraform/openstack/group_vars
@@ -0,0 +1 @@
+../../../inventory/group_vars
\ No newline at end of file
diff --git a/contrib/terraform/openstack/kubespray.tf b/contrib/terraform/openstack/kubespray.tf
index 42d529d64..0f31b3d16 100644
--- a/contrib/terraform/openstack/kubespray.tf
+++ b/contrib/terraform/openstack/kubespray.tf
@@ -68,7 +68,7 @@ resource "openstack_compute_instance_v2" "k8s_master" {
floating_ip = "${element(openstack_networking_floatingip_v2.k8s_master.*.address, count.index)}"
metadata = {
ssh_user = "${var.ssh_user}"
- kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster"
+ kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster,vault"
}
}
@@ -87,10 +87,10 @@ resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip" {
"${openstack_compute_secgroup_v2.k8s.name}" ]
metadata = {
ssh_user = "${var.ssh_user}"
- kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster"
+ kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster,vault,no-floating"
}
provisioner "local-exec" {
- command = "sed s/USER/${var.ssh_user}/ contrib/terraform/openstack/ansible_bastion_template.txt | sed s/BASTION_ADDRESS/${element(openstack_networking_floatingip_v2.k8s_master.*.address, 0)}/ > contrib/terraform/openstack/group_vars/k8s-cluster.yml"
+ command = "sed s/USER/${var.ssh_user}/ contrib/terraform/openstack/ansible_bastion_template.txt | sed s/BASTION_ADDRESS/${element(openstack_networking_floatingip_v2.k8s_master.*.address, 0)}/ > contrib/terraform/openstack/group_vars/no-floating.yml"
}
}
@@ -107,7 +107,7 @@ resource "openstack_compute_instance_v2" "k8s_node" {
floating_ip = "${element(openstack_networking_floatingip_v2.k8s_node.*.address, count.index)}"
metadata = {
ssh_user = "${var.ssh_user}"
- kubespray_groups = "kube-node,k8s-cluster"
+ kubespray_groups = "kube-node,k8s-cluster,vault"
}
}
@@ -123,10 +123,10 @@ resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
security_groups = ["${openstack_compute_secgroup_v2.k8s.name}" ]
metadata = {
ssh_user = "${var.ssh_user}"
- kubespray_groups = "kube-node,k8s-cluster"
+ kubespray_groups = "kube-node,k8s-cluster,vault,no-floating"
}
provisioner "local-exec" {
- command = "sed s/USER/${var.ssh_user}/ contrib/terraform/openstack/ansible_bastion_template.txt | sed s/BASTION_ADDRESS/${element(openstack_networking_floatingip_v2.k8s_master.*.address, 0)}/ > contrib/terraform/openstack/group_vars/k8s-cluster.yml"
+ command = "sed s/USER/${var.ssh_user}/ contrib/terraform/openstack/ansible_bastion_template.txt | sed s/BASTION_ADDRESS/${element(openstack_networking_floatingip_v2.k8s_master.*.address, 0)}/ > contrib/terraform/openstack/group_vars/no-floating.yml"
}
}
--
GitLab