run terraform FMT for readability

contrib/terraform/openstack/kubespray.tf

@@ -1,4 +1,3 @@
-
 module "network" {
   source = "modules/network"
 
@@ -8,7 +7,6 @@ module "network" {
   dns_nameservers = "${var.dns_nameservers}"
 }
 
-
 module "ips" {
   source = "modules/ips"
 

contrib/terraform/openstack/modules/compute/main.tf

@@ -1,7 +1,6 @@
-
-
 variable user_data {
   type = "string"
+
   default = <<EOF
 #cloud-config
 manage_etc_hosts: localhost
@@ -9,6 +8,7 @@ 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))}"
@@ -17,6 +17,7 @@ resource "openstack_compute_keypair_v2" "k8s" {
 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"
@@ -28,6 +29,7 @@ resource "openstack_compute_secgroup_v2" "k8s_master" {
 resource "openstack_compute_secgroup_v2" "bastion" {
   name        = "${var.cluster_name}-bastion"
   description = "${var.cluster_name} - Bastion Server"
+
   rule {
     ip_protocol = "tcp"
     from_port   = "22"
@@ -39,24 +41,28 @@ resource "openstack_compute_secgroup_v2" "bastion" {
 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"
@@ -71,12 +77,16 @@ resource "openstack_compute_instance_v2" "bastion" {
   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}",
+
+  security_groups = ["${openstack_compute_secgroup_v2.k8s.name}",
     "${openstack_compute_secgroup_v2.bastion.name}",
-                        "default" ]
+    "default",
+  ]
+
   metadata = {
     ssh_user         = "${var.ssh_user}"
     kubespray_groups = "bastion"
@@ -96,18 +106,23 @@ resource "openstack_compute_instance_v2" "k8s_master" {
   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}",
+
+  security_groups = ["${openstack_compute_secgroup_v2.k8s_master.name}",
     "${openstack_compute_secgroup_v2.bastion.name}",
     "${openstack_compute_secgroup_v2.k8s.name}",
-                        "default" ]
+    "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}"
 }
 
@@ -117,16 +132,21 @@ resource "openstack_compute_instance_v2" "k8s_master_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}" ]
+  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}"
 }
 
@@ -136,36 +156,44 @@ resource "openstack_compute_instance_v2" "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}" ]
+
+  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}",
+
+  security_groups = ["${openstack_compute_secgroup_v2.k8s_master.name}",
     "${openstack_compute_secgroup_v2.k8s.name}",
-                        "default" ]
+    "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}"
 }
 
@@ -175,37 +203,46 @@ resource "openstack_compute_instance_v2" "k8s_master_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}" ]
+  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}",
+
+  security_groups = ["${openstack_compute_secgroup_v2.k8s.name}",
     "${openstack_compute_secgroup_v2.bastion.name}",
-                        "default" ]
+    "default",
+  ]
+
   metadata = {
     ssh_user         = "${var.ssh_user}"
     kubespray_groups = "kube-node,k8s-cluster"
     depends_on       = "${var.network_id}"
   }
+
   user_data = "${var.user_data}"
 }
 
@@ -215,16 +252,21 @@ resource "openstack_compute_instance_v2" "k8s_node_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" ]
+  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}"
 }
 
@@ -246,7 +288,6 @@ resource "openstack_compute_floatingip_associate_v2" "k8s_node" {
   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}"
@@ -260,16 +301,21 @@ resource "openstack_compute_instance_v2" "glusterfs_node_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" ]
+    "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"
 }
 

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" {}
-}
 
-variable "number_of_k8s_nodes_no_floating_ip" {
+variable "number_of_k8s_nodes_no_floating_ip" {}
-}
 
-variable "number_of_bastions" {
+variable "number_of_bastions" {}
-}
 
-variable "number_of_gfs_nodes_no_floating_ip" {
+variable "number_of_gfs_nodes_no_floating_ip" {}
-}
 
-variable "gfs_volume_size_in_gb" {
+variable "gfs_volume_size_in_gb" {}
-}
 
-variable "public_key_path" {
+variable "public_key_path" {}
-}
 
-variable "image" {
+variable "image" {}
-}
 
-variable "image_gfs" {
+variable "image_gfs" {}
-}
 
-variable "ssh_user" {
+variable "ssh_user" {}
-}
 
-variable "ssh_user_gfs" {
+variable "ssh_user_gfs" {}
-}
 
-variable "flavor_k8s_master" {
+variable "flavor_k8s_master" {}
-}
 
-variable "flavor_k8s_node" {
+variable "flavor_k8s_node" {}
-}
 
-variable "flavor_etcd" {
+variable "flavor_etcd" {}
-}
 
-variable "flavor_gfs_node" {
+variable "flavor_gfs_node" {}
-}
 
-variable "network_name" {
+variable "network_name" {}
-}
 
-variable "flavor_bastion" {
+variable "flavor_bastion" {}
-}
-
-
-variable "network_id"{
-
-}
 
+variable "network_id" {}
 
 variable "k8s_master_fips" {
   type = "list"

contrib/terraform/openstack/modules/ips/main.tf

@@ -1,4 +1,3 @@
-
 resource "null_resource" "dummy_dependency" {
   triggers {
     dependency_id = "${var.router_id}"

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 "router_id" {}
-
-variable "network_name" {
-}
-
-variable "router_id"{
-
-}

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"

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"
 }

contrib/terraform/openstack/variables.tf

@@ -97,7 +97,7 @@ variable "network_name" {
   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     = []