From 74fd975b57bdc1559f58b75cb28ba95513f1489c Mon Sep 17 00:00:00 2001
From: ArchiFleKs <lefevre.kevin@gmail.com>
Date: Fri, 5 Jan 2018 12:09:04 +0100
Subject: [PATCH] run terraform FMT for readability
---
contrib/terraform/openstack/kubespray.tf | 70 ++-
.../openstack/modules/compute/main.tf | 478 ++++++++++--------
.../openstack/modules/compute/variables.tf | 72 +--
.../terraform/openstack/modules/ips/main.tf | 19 +-
.../openstack/modules/ips/outputs.tf | 6 +-
.../openstack/modules/ips/variables.tf | 27 +-
.../openstack/modules/network/main.tf | 1 -
.../openstack/modules/network/outputs.tf | 4 +-
.../openstack/modules/network/variables.tf | 12 +-
contrib/terraform/openstack/variables.tf | 30 +-
10 files changed, 360 insertions(+), 359 deletions(-)
diff --git a/contrib/terraform/openstack/kubespray.tf b/contrib/terraform/openstack/kubespray.tf
index a64eb224c..e0dbfd02d 100644
--- a/contrib/terraform/openstack/kubespray.tf
+++ b/contrib/terraform/openstack/kubespray.tf
@@ -1,55 +1,53 @@
-
module "network" {
source = "modules/network"
- external_net = "${var.external_net}"
- network_name = "${var.network_name}"
- cluster_name = "${var.cluster_name}"
+ external_net = "${var.external_net}"
+ network_name = "${var.network_name}"
+ cluster_name = "${var.cluster_name}"
dns_nameservers = "${var.dns_nameservers}"
}
-
module "ips" {
source = "modules/ips"
- number_of_k8s_masters = "${var.number_of_k8s_masters}"
+ number_of_k8s_masters = "${var.number_of_k8s_masters}"
number_of_k8s_masters_no_etcd = "${var.number_of_k8s_masters_no_etcd}"
- number_of_k8s_nodes = "${var.number_of_k8s_nodes}"
- floatingip_pool = "${var.floatingip_pool}"
- number_of_bastions = "${var.number_of_bastions}"
- external_net = "${var.external_net}"
- network_name = "${var.network_name}"
- router_id = "${module.network.router_id}"
+ number_of_k8s_nodes = "${var.number_of_k8s_nodes}"
+ floatingip_pool = "${var.floatingip_pool}"
+ number_of_bastions = "${var.number_of_bastions}"
+ external_net = "${var.external_net}"
+ network_name = "${var.network_name}"
+ router_id = "${module.network.router_id}"
}
module "compute" {
source = "modules/compute"
- cluster_name = "${var.cluster_name}"
- 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}"
- number_of_k8s_masters_no_floating_ip = "${var.number_of_k8s_masters_no_floating_ip}"
+ cluster_name = "${var.cluster_name}"
+ 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}"
+ number_of_k8s_masters_no_floating_ip = "${var.number_of_k8s_masters_no_floating_ip}"
number_of_k8s_masters_no_floating_ip_no_etcd = "${var.number_of_k8s_masters_no_floating_ip_no_etcd}"
- number_of_k8s_nodes = "${var.number_of_k8s_nodes}"
- number_of_bastions = "${var.number_of_bastions}"
- number_of_k8s_nodes_no_floating_ip = "${var.number_of_k8s_nodes_no_floating_ip}"
- number_of_gfs_nodes_no_floating_ip = "${var.number_of_gfs_nodes_no_floating_ip}"
- gfs_volume_size_in_gb = "${var.gfs_volume_size_in_gb}"
- public_key_path = "${var.public_key_path}"
- image = "${var.image}"
- image_gfs = "${var.image_gfs}"
- ssh_user = "${var.ssh_user}"
- ssh_user_gfs = "${var.ssh_user_gfs}"
- flavor_k8s_master = "${var.flavor_k8s_master}"
- flavor_k8s_node = "${var.flavor_k8s_node}"
- flavor_etcd = "${var.flavor_etcd}"
- flavor_gfs_node = "${var.flavor_gfs_node}"
- network_name = "${var.network_name}"
- flavor_bastion = "${var.flavor_bastion}"
- k8s_master_fips = "${module.ips.k8s_master_fips}"
- k8s_node_fips = "${module.ips.k8s_node_fips}"
- bastion_fips = "${module.ips.bastion_fips}"
+ number_of_k8s_nodes = "${var.number_of_k8s_nodes}"
+ number_of_bastions = "${var.number_of_bastions}"
+ number_of_k8s_nodes_no_floating_ip = "${var.number_of_k8s_nodes_no_floating_ip}"
+ number_of_gfs_nodes_no_floating_ip = "${var.number_of_gfs_nodes_no_floating_ip}"
+ gfs_volume_size_in_gb = "${var.gfs_volume_size_in_gb}"
+ public_key_path = "${var.public_key_path}"
+ image = "${var.image}"
+ image_gfs = "${var.image_gfs}"
+ ssh_user = "${var.ssh_user}"
+ ssh_user_gfs = "${var.ssh_user_gfs}"
+ flavor_k8s_master = "${var.flavor_k8s_master}"
+ flavor_k8s_node = "${var.flavor_k8s_node}"
+ flavor_etcd = "${var.flavor_etcd}"
+ flavor_gfs_node = "${var.flavor_gfs_node}"
+ network_name = "${var.network_name}"
+ flavor_bastion = "${var.flavor_bastion}"
+ k8s_master_fips = "${module.ips.k8s_master_fips}"
+ k8s_node_fips = "${module.ips.k8s_node_fips}"
+ bastion_fips = "${module.ips.bastion_fips}"
network_id = "${module.network.router_id}"
}
diff --git a/contrib/terraform/openstack/modules/compute/main.tf b/contrib/terraform/openstack/modules/compute/main.tf
index 624c39f0d..d352a5adf 100644
--- a/contrib/terraform/openstack/modules/compute/main.tf
+++ b/contrib/terraform/openstack/modules/compute/main.tf
@@ -1,7 +1,6 @@
+variable user_data {
+ type = "string"
-
-variable user_data {
- type = "string"
default = <<EOF
#cloud-config
manage_etc_hosts: localhost
@@ -9,272 +8,319 @@ package_update: true
package_upgrade: true
EOF
}
+
resource "openstack_compute_keypair_v2" "k8s" {
- name = "kubernetes-${var.cluster_name}"
- public_key = "${chomp(file(var.public_key_path))}"
+ name = "kubernetes-${var.cluster_name}"
+ public_key = "${chomp(file(var.public_key_path))}"
}
resource "openstack_compute_secgroup_v2" "k8s_master" {
- name = "${var.cluster_name}-k8s-master"
- description = "${var.cluster_name} - Kubernetes Master"
- rule {
- ip_protocol = "tcp"
- from_port = "6443"
- to_port = "6443"
- cidr = "0.0.0.0/0"
- }
+ name = "${var.cluster_name}-k8s-master"
+ description = "${var.cluster_name} - Kubernetes Master"
+
+ rule {
+ ip_protocol = "tcp"
+ from_port = "6443"
+ to_port = "6443"
+ cidr = "0.0.0.0/0"
+ }
}
resource "openstack_compute_secgroup_v2" "bastion" {
- name = "${var.cluster_name}-bastion"
- description = "${var.cluster_name} - Bastion Server"
- rule {
- ip_protocol = "tcp"
- from_port = "22"
- to_port = "22"
- cidr = "0.0.0.0/0"
- }
+ name = "${var.cluster_name}-bastion"
+ description = "${var.cluster_name} - Bastion Server"
+
+ rule {
+ ip_protocol = "tcp"
+ from_port = "22"
+ to_port = "22"
+ cidr = "0.0.0.0/0"
+ }
}
resource "openstack_compute_secgroup_v2" "k8s" {
- name = "${var.cluster_name}-k8s"
- description = "${var.cluster_name} - Kubernetes"
- rule {
- ip_protocol = "icmp"
- from_port = "-1"
- to_port = "-1"
- cidr = "0.0.0.0/0"
- }
- rule {
- ip_protocol = "tcp"
- from_port = "1"
- to_port = "65535"
- self = true
- }
- rule {
- ip_protocol = "udp"
- from_port = "1"
- to_port = "65535"
- self = true
- }
- rule {
- ip_protocol = "icmp"
- from_port = "-1"
- to_port = "-1"
- self = true
- }
+ name = "${var.cluster_name}-k8s"
+ description = "${var.cluster_name} - Kubernetes"
+
+ rule {
+ ip_protocol = "icmp"
+ from_port = "-1"
+ to_port = "-1"
+ cidr = "0.0.0.0/0"
+ }
+
+ rule {
+ ip_protocol = "tcp"
+ from_port = "1"
+ to_port = "65535"
+ self = true
+ }
+
+ rule {
+ ip_protocol = "udp"
+ from_port = "1"
+ to_port = "65535"
+ self = true
+ }
+
+ rule {
+ ip_protocol = "icmp"
+ from_port = "-1"
+ to_port = "-1"
+ self = true
+ }
}
resource "openstack_compute_instance_v2" "bastion" {
- name = "${var.cluster_name}-bastion-${count.index+1}"
- count = "${var.number_of_bastions}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_bastion}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s.name}",
- "${openstack_compute_secgroup_v2.bastion.name}",
- "default" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "bastion"
- depends_on = "${var.network_id}"
- }
-
- provisioner "local-exec" {
- command = "sed s/USER/${var.ssh_user}/ contrib/terraform/openstack/ansible_bastion_template.txt | sed s/BASTION_ADDRESS/${var.bastion_fips[0]}/ > contrib/terraform/openstack/group_vars/no-floating.yml"
- }
-
- user_data = "${var.user_data}"
+ name = "${var.cluster_name}-bastion-${count.index+1}"
+ count = "${var.number_of_bastions}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_bastion}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s.name}",
+ "${openstack_compute_secgroup_v2.bastion.name}",
+ "default",
+ ]
+
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "bastion"
+ depends_on = "${var.network_id}"
+ }
+
+ provisioner "local-exec" {
+ command = "sed s/USER/${var.ssh_user}/ contrib/terraform/openstack/ansible_bastion_template.txt | sed s/BASTION_ADDRESS/${var.bastion_fips[0]}/ > contrib/terraform/openstack/group_vars/no-floating.yml"
+ }
+
+ user_data = "${var.user_data}"
}
resource "openstack_compute_instance_v2" "k8s_master" {
- name = "${var.cluster_name}-k8s-master-${count.index+1}"
- count = "${var.number_of_k8s_masters}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_k8s_master}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s_master.name}",
- "${openstack_compute_secgroup_v2.bastion.name}",
- "${openstack_compute_secgroup_v2.k8s.name}",
- "default" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster,vault"
- depends_on = "${var.network_id}"
- }
- user_data = "${var.user_data}"
+ name = "${var.cluster_name}-k8s-master-${count.index+1}"
+ count = "${var.number_of_k8s_masters}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_k8s_master}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s_master.name}",
+ "${openstack_compute_secgroup_v2.bastion.name}",
+ "${openstack_compute_secgroup_v2.k8s.name}",
+ "default",
+ ]
+
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster,vault"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "${var.user_data}"
}
resource "openstack_compute_instance_v2" "k8s_master_no_etcd" {
- name = "${var.cluster_name}-k8s-master-ne-${count.index+1}"
- count = "${var.number_of_k8s_masters_no_etcd}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_k8s_master}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s_master.name}",
- "${openstack_compute_secgroup_v2.k8s.name}" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "kube-master,kube-node,k8s-cluster,vault"
- depends_on = "${var.network_id}"
- }
- user_data = "${var.user_data}"
+ name = "${var.cluster_name}-k8s-master-ne-${count.index+1}"
+ count = "${var.number_of_k8s_masters_no_etcd}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_k8s_master}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s_master.name}",
+ "${openstack_compute_secgroup_v2.k8s.name}",
+ ]
+
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "kube-master,kube-node,k8s-cluster,vault"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "${var.user_data}"
}
resource "openstack_compute_instance_v2" "etcd" {
- name = "${var.cluster_name}-etcd-${count.index+1}"
- count = "${var.number_of_etcd}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_etcd}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s.name}" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "etcd,vault,no-floating"
- depends_on = "${var.network_id}"
- }
- user_data = "${var.user_data}"
-}
+ name = "${var.cluster_name}-etcd-${count.index+1}"
+ count = "${var.number_of_etcd}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_etcd}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s.name}"]
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "etcd,vault,no-floating"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "${var.user_data}"
+}
resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip" {
- name = "${var.cluster_name}-k8s-master-nf-${count.index+1}"
- count = "${var.number_of_k8s_masters_no_floating_ip}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_k8s_master}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s_master.name}",
- "${openstack_compute_secgroup_v2.k8s.name}",
- "default" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster,vault,no-floating"
- depends_on = "${var.network_id}"
- }
- user_data = "${var.user_data}"
+ name = "${var.cluster_name}-k8s-master-nf-${count.index+1}"
+ count = "${var.number_of_k8s_masters_no_floating_ip}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_k8s_master}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s_master.name}",
+ "${openstack_compute_secgroup_v2.k8s.name}",
+ "default",
+ ]
+
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "etcd,kube-master,kube-node,k8s-cluster,vault,no-floating"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "${var.user_data}"
}
resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip_no_etcd" {
- name = "${var.cluster_name}-k8s-master-ne-nf-${count.index+1}"
- count = "${var.number_of_k8s_masters_no_floating_ip_no_etcd}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_k8s_master}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s_master.name}",
- "${openstack_compute_secgroup_v2.k8s.name}" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "kube-master,kube-node,k8s-cluster,vault,no-floating"
- depends_on = "${var.network_id}"
- }
- user_data = "${var.user_data}"
-}
+ name = "${var.cluster_name}-k8s-master-ne-nf-${count.index+1}"
+ count = "${var.number_of_k8s_masters_no_floating_ip_no_etcd}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_k8s_master}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s_master.name}",
+ "${openstack_compute_secgroup_v2.k8s.name}",
+ ]
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "kube-master,kube-node,k8s-cluster,vault,no-floating"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "${var.user_data}"
+}
resource "openstack_compute_instance_v2" "k8s_node" {
- name = "${var.cluster_name}-k8s-node-${count.index+1}"
- count = "${var.number_of_k8s_nodes}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_k8s_node}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s.name}",
- "${openstack_compute_secgroup_v2.bastion.name}",
- "default" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "kube-node,k8s-cluster"
- depends_on = "${var.network_id}"
- }
- user_data = "${var.user_data}"
+ name = "${var.cluster_name}-k8s-node-${count.index+1}"
+ count = "${var.number_of_k8s_nodes}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_k8s_node}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s.name}",
+ "${openstack_compute_secgroup_v2.bastion.name}",
+ "default",
+ ]
+
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "kube-node,k8s-cluster"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "${var.user_data}"
}
resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
- name = "${var.cluster_name}-k8s-node-nf-${count.index+1}"
- count = "${var.number_of_k8s_nodes_no_floating_ip}"
- image_name = "${var.image}"
- flavor_id = "${var.flavor_k8s_node}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = [ "${openstack_compute_secgroup_v2.k8s.name}",
- "default" ]
- metadata = {
- ssh_user = "${var.ssh_user}"
- kubespray_groups = "kube-node,k8s-cluster,no-floating"
- depends_on = "${var.network_id}"
- }
- user_data = "${var.user_data}"
+ name = "${var.cluster_name}-k8s-node-nf-${count.index+1}"
+ count = "${var.number_of_k8s_nodes_no_floating_ip}"
+ image_name = "${var.image}"
+ flavor_id = "${var.flavor_k8s_node}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s.name}",
+ "default",
+ ]
+
+ metadata = {
+ ssh_user = "${var.ssh_user}"
+ kubespray_groups = "kube-node,k8s-cluster,no-floating"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "${var.user_data}"
}
resource "openstack_compute_floatingip_associate_v2" "bastion" {
- count = "${var.number_of_bastions}"
- floating_ip = "${var.bastion_fips[count.index]}"
- instance_id = "${element(openstack_compute_instance_v2.bastion.*.id, count.index)}"
+ count = "${var.number_of_bastions}"
+ floating_ip = "${var.bastion_fips[count.index]}"
+ instance_id = "${element(openstack_compute_instance_v2.bastion.*.id, count.index)}"
}
resource "openstack_compute_floatingip_associate_v2" "k8s_master" {
- count = "${var.number_of_k8s_masters}"
- instance_id = "${element(openstack_compute_instance_v2.k8s_master.*.id, count.index)}"
- floating_ip = "${var.k8s_master_fips[count.index]}"
+ count = "${var.number_of_k8s_masters}"
+ instance_id = "${element(openstack_compute_instance_v2.k8s_master.*.id, count.index)}"
+ floating_ip = "${var.k8s_master_fips[count.index]}"
}
resource "openstack_compute_floatingip_associate_v2" "k8s_node" {
- count = "${var.number_of_k8s_nodes}"
- floating_ip = "${var.k8s_node_fips[count.index]}"
- instance_id = "${element(openstack_compute_instance_v2.k8s_node.*.id, count.index)}"
+ count = "${var.number_of_k8s_nodes}"
+ floating_ip = "${var.k8s_node_fips[count.index]}"
+ instance_id = "${element(openstack_compute_instance_v2.k8s_node.*.id, count.index)}"
}
-
resource "openstack_blockstorage_volume_v2" "glusterfs_volume" {
- name = "${var.cluster_name}-glusterfs_volume-${count.index+1}"
- count = "${var.number_of_gfs_nodes_no_floating_ip}"
+ name = "${var.cluster_name}-glusterfs_volume-${count.index+1}"
+ count = "${var.number_of_gfs_nodes_no_floating_ip}"
description = "Non-ephemeral volume for GlusterFS"
- size = "${var.gfs_volume_size_in_gb}"
+ size = "${var.gfs_volume_size_in_gb}"
}
resource "openstack_compute_instance_v2" "glusterfs_node_no_floating_ip" {
- name = "${var.cluster_name}-gfs-node-nf-${count.index+1}"
- count = "${var.number_of_gfs_nodes_no_floating_ip}"
- image_name = "${var.image_gfs}"
- flavor_id = "${var.flavor_gfs_node}"
- key_pair = "${openstack_compute_keypair_v2.k8s.name}"
- network {
- name = "${var.network_name}"
- }
- security_groups = ["${openstack_compute_secgroup_v2.k8s.name}",
- "default" ]
- metadata = {
- ssh_user = "${var.ssh_user_gfs}"
- kubespray_groups = "gfs-cluster,network-storage,no-floating"
- depends_on = "${var.network_id}"
- }
- user_data = "#cloud-config\nmanage_etc_hosts: localhost\npackage_update: true\npackage_upgrade: true"
+ name = "${var.cluster_name}-gfs-node-nf-${count.index+1}"
+ count = "${var.number_of_gfs_nodes_no_floating_ip}"
+ image_name = "${var.image_gfs}"
+ flavor_id = "${var.flavor_gfs_node}"
+ key_pair = "${openstack_compute_keypair_v2.k8s.name}"
+
+ network {
+ name = "${var.network_name}"
+ }
+
+ security_groups = ["${openstack_compute_secgroup_v2.k8s.name}",
+ "default",
+ ]
+
+ metadata = {
+ ssh_user = "${var.ssh_user_gfs}"
+ kubespray_groups = "gfs-cluster,network-storage,no-floating"
+ depends_on = "${var.network_id}"
+ }
+
+ user_data = "#cloud-config\nmanage_etc_hosts: localhost\npackage_update: true\npackage_upgrade: true"
}
resource "openstack_compute_volume_attach_v2" "glusterfs_volume" {
- count = "${var.number_of_gfs_nodes_no_floating_ip}"
+ count = "${var.number_of_gfs_nodes_no_floating_ip}"
instance_id = "${element(openstack_compute_instance_v2.glusterfs_node_no_floating_ip.*.id, count.index)}"
volume_id = "${element(openstack_blockstorage_volume_v2.glusterfs_volume.*.id, count.index)}"
}
diff --git a/contrib/terraform/openstack/modules/compute/variables.tf b/contrib/terraform/openstack/modules/compute/variables.tf
index c02196674..518e15069 100644
--- a/contrib/terraform/openstack/modules/compute/variables.tf
+++ b/contrib/terraform/openstack/modules/compute/variables.tf
@@ -1,74 +1,48 @@
-variable "cluster_name" {
-}
+variable "cluster_name" {}
-variable "number_of_k8s_masters" {
-}
+variable "number_of_k8s_masters" {}
-variable "number_of_k8s_masters_no_etcd" {
-}
+variable "number_of_k8s_masters_no_etcd" {}
-variable "number_of_etcd" {
-}
+variable "number_of_etcd" {}
-variable "number_of_k8s_masters_no_floating_ip" {
-}
+variable "number_of_k8s_masters_no_floating_ip" {}
-variable "number_of_k8s_masters_no_floating_ip_no_etcd" {
-}
+variable "number_of_k8s_masters_no_floating_ip_no_etcd" {}
-variable "number_of_k8s_nodes" {
-}
-
-variable "number_of_k8s_nodes_no_floating_ip" {
-}
-
-variable "number_of_bastions" {
-}
-
-variable "number_of_gfs_nodes_no_floating_ip" {
-}
+variable "number_of_k8s_nodes" {}
-variable "gfs_volume_size_in_gb" {
-}
+variable "number_of_k8s_nodes_no_floating_ip" {}
-variable "public_key_path" {
-}
+variable "number_of_bastions" {}
-variable "image" {
-}
+variable "number_of_gfs_nodes_no_floating_ip" {}
-variable "image_gfs" {
-}
+variable "gfs_volume_size_in_gb" {}
-variable "ssh_user" {
-}
+variable "public_key_path" {}
-variable "ssh_user_gfs" {
-}
+variable "image" {}
-variable "flavor_k8s_master" {
-}
+variable "image_gfs" {}
-variable "flavor_k8s_node" {
-}
+variable "ssh_user" {}
-variable "flavor_etcd" {
-}
+variable "ssh_user_gfs" {}
-variable "flavor_gfs_node" {
-}
+variable "flavor_k8s_master" {}
-variable "network_name" {
-}
+variable "flavor_k8s_node" {}
-variable "flavor_bastion" {
-}
+variable "flavor_etcd" {}
+variable "flavor_gfs_node" {}
-variable "network_id"{
+variable "network_name" {}
-}
+variable "flavor_bastion" {}
+variable "network_id" {}
variable "k8s_master_fips" {
type = "list"
diff --git a/contrib/terraform/openstack/modules/ips/main.tf b/contrib/terraform/openstack/modules/ips/main.tf
index 787dc88a2..43d543307 100644
--- a/contrib/terraform/openstack/modules/ips/main.tf
+++ b/contrib/terraform/openstack/modules/ips/main.tf
@@ -1,4 +1,3 @@
-
resource "null_resource" "dummy_dependency" {
triggers {
dependency_id = "${var.router_id}"
@@ -6,19 +5,19 @@ resource "null_resource" "dummy_dependency" {
}
resource "openstack_networking_floatingip_v2" "k8s_master" {
- count = "${var.number_of_k8s_masters}"
- pool = "${var.floatingip_pool}"
- depends_on = ["null_resource.dummy_dependency"]
+ count = "${var.number_of_k8s_masters}"
+ pool = "${var.floatingip_pool}"
+ depends_on = ["null_resource.dummy_dependency"]
}
resource "openstack_networking_floatingip_v2" "k8s_node" {
- count = "${var.number_of_k8s_nodes}"
- pool = "${var.floatingip_pool}"
- depends_on = ["null_resource.dummy_dependency"]
+ count = "${var.number_of_k8s_nodes}"
+ pool = "${var.floatingip_pool}"
+ depends_on = ["null_resource.dummy_dependency"]
}
resource "openstack_networking_floatingip_v2" "bastion" {
- count = "${var.number_of_bastions}"
- pool = "${var.floatingip_pool}"
- depends_on = ["null_resource.dummy_dependency"]
+ count = "${var.number_of_bastions}"
+ pool = "${var.floatingip_pool}"
+ depends_on = ["null_resource.dummy_dependency"]
}
diff --git a/contrib/terraform/openstack/modules/ips/outputs.tf b/contrib/terraform/openstack/modules/ips/outputs.tf
index b1cb2435d..10bea5519 100644
--- a/contrib/terraform/openstack/modules/ips/outputs.tf
+++ b/contrib/terraform/openstack/modules/ips/outputs.tf
@@ -1,11 +1,11 @@
output "k8s_master_fips" {
- value = ["${openstack_networking_floatingip_v2.k8s_master.*.address}"]
+ value = ["${openstack_networking_floatingip_v2.k8s_master.*.address}"]
}
output "k8s_node_fips" {
- value = ["${openstack_networking_floatingip_v2.k8s_node.*.address}"]
+ value = ["${openstack_networking_floatingip_v2.k8s_node.*.address}"]
}
output "bastion_fips" {
- value = ["${openstack_networking_floatingip_v2.bastion.*.address}"]
+ value = ["${openstack_networking_floatingip_v2.bastion.*.address}"]
}
diff --git a/contrib/terraform/openstack/modules/ips/variables.tf b/contrib/terraform/openstack/modules/ips/variables.tf
index 02a1f7b86..b5a32d5b2 100644
--- a/contrib/terraform/openstack/modules/ips/variables.tf
+++ b/contrib/terraform/openstack/modules/ips/variables.tf
@@ -1,26 +1,15 @@
-variable "number_of_k8s_masters" {
-}
+variable "number_of_k8s_masters" {}
-variable "number_of_k8s_masters_no_etcd" {
-}
+variable "number_of_k8s_masters_no_etcd" {}
-variable "number_of_k8s_nodes" {
-}
+variable "number_of_k8s_nodes" {}
-variable "floatingip_pool" {
-}
+variable "floatingip_pool" {}
-variable "number_of_bastions" {
+variable "number_of_bastions" {}
- }
+variable "external_net" {}
-variable "external_net" {
+variable "network_name" {}
-}
-
-variable "network_name" {
-}
-
-variable "router_id"{
-
-}
+variable "router_id" {}
diff --git a/contrib/terraform/openstack/modules/network/main.tf b/contrib/terraform/openstack/modules/network/main.tf
index 9d5d8a98b..a5ef099ed 100644
--- a/contrib/terraform/openstack/modules/network/main.tf
+++ b/contrib/terraform/openstack/modules/network/main.tf
@@ -1,4 +1,3 @@
-
resource "openstack_networking_router_v2" "k8s" {
name = "${var.cluster_name}-router"
admin_state_up = "true"
diff --git a/contrib/terraform/openstack/modules/network/outputs.tf b/contrib/terraform/openstack/modules/network/outputs.tf
index d8d619981..a426202b9 100644
--- a/contrib/terraform/openstack/modules/network/outputs.tf
+++ b/contrib/terraform/openstack/modules/network/outputs.tf
@@ -1,7 +1,7 @@
output "router_id" {
- value = "${openstack_networking_router_interface_v2.k8s.id}"
+ value = "${openstack_networking_router_interface_v2.k8s.id}"
}
output "network_id" {
- value = "${openstack_networking_subnet_v2.k8s.id}"
+ value = "${openstack_networking_subnet_v2.k8s.id}"
}
diff --git a/contrib/terraform/openstack/modules/network/variables.tf b/contrib/terraform/openstack/modules/network/variables.tf
index f5736b120..a7952bced 100644
--- a/contrib/terraform/openstack/modules/network/variables.tf
+++ b/contrib/terraform/openstack/modules/network/variables.tf
@@ -1,13 +1,9 @@
-variable "external_net" {
+variable "external_net" {}
-}
-
-variable "network_name" {
-}
+variable "network_name" {}
-variable "cluster_name" {
-}
+variable "cluster_name" {}
-variable "dns_nameservers"{
+variable "dns_nameservers" {
type = "list"
}
diff --git a/contrib/terraform/openstack/variables.tf b/contrib/terraform/openstack/variables.tf
index 551fa193f..925750ab1 100644
--- a/contrib/terraform/openstack/variables.tf
+++ b/contrib/terraform/openstack/variables.tf
@@ -44,68 +44,68 @@ variable "gfs_volume_size_in_gb" {
variable "public_key_path" {
description = "The path of the ssh pub key"
- default = "~/.ssh/id_rsa.pub"
+ default = "~/.ssh/id_rsa.pub"
}
variable "image" {
description = "the image to use"
- default = "ubuntu-14.04"
+ default = "ubuntu-14.04"
}
variable "image_gfs" {
description = "Glance image to use for GlusterFS"
- default = "ubuntu-16.04"
+ default = "ubuntu-16.04"
}
variable "ssh_user" {
description = "used to fill out tags for ansible inventory"
- default = "ubuntu"
+ default = "ubuntu"
}
variable "ssh_user_gfs" {
description = "used to fill out tags for ansible inventory"
- default = "ubuntu"
+ default = "ubuntu"
}
variable "flavor_bastion" {
description = "Use 'nova flavor-list' command to see what your OpenStack instance uses for IDs"
- default = 3
+ default = 3
}
variable "flavor_k8s_master" {
description = "Use 'nova flavor-list' command to see what your OpenStack instance uses for IDs"
- default = 3
+ default = 3
}
variable "flavor_k8s_node" {
description = "Use 'nova flavor-list' command to see what your OpenStack instance uses for IDs"
- default = 3
+ default = 3
}
variable "flavor_etcd" {
description = "Use 'nova flavor-list' command to see what your OpenStack instance uses for IDs"
- default = 3
+ default = 3
}
variable "flavor_gfs_node" {
description = "Use 'nova flavor-list' command to see what your OpenStack instance uses for IDs"
- default = 3
+ default = 3
}
variable "network_name" {
description = "name of the internal network to use"
- default = "internal"
+ default = "internal"
}
-variable "dns_nameservers"{
+variable "dns_nameservers" {
description = "An array of DNS name server names used by hosts in this subnet."
- type = "list"
- default = []
+ type = "list"
+ default = []
}
variable "floatingip_pool" {
description = "name of the floating ip pool to use"
- default = "external"
+ default = "external"
}
variable "external_net" {
--
GitLab