Merge pull request #3 from xe-nvdk/master

Update to Terraform 0.15.4

auth.tf

@@ -0,0 +1,5 @@
+provider "aws" {
+  region     = "us-east-2"
+  access_key = ""
+  secret_key = ""
+}

init/data-nodes.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+sudo apt-get update
+sudo apt dist-upgrade -y
+sudo apt-get install -y python wget
+sudo sleep 10;
+
+# Format attached disks
+sudo mkfs.ext4 /dev/xvdh
+
+# Create folders & mount disks
+sudo mkdir -p /mnt/influxdb/data
+sudo mount /dev/xvdh /mnt/influxdb/data
+
+# Create script to mount disks at startup
+echo 'echo # influxdb-data-disk >> /etc/fstab' >> /tmp/disks.sh
+echo 'echo /dev/xvdh    /mnt/influxdb/data    ext4    defaults    0    2 >> /etc/fstab' >> /tmp/disks.sh
+
+# Mount disks at startup
+sudo bash /tmp/disks.sh
+
+# Download, install and start InfluxDB data-nodes
+sudo wget -O /tmp/influxdb-data_1.8.6-c1.8.6_amd64.deb https://dl.influxdata.com/enterprise/releases/influxdb-data_1.8.6-c1.8.6_amd64.deb
+sleep 5;
+sudo dpkg -i /tmp/influxdb-data_1.8.6-c1.8.6_amd64.deb
+sleep 5;
+sudo systemctl start influxdb

init/meta-nodes.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+sudo apt-get update
+sudo apt dist-upgrade -y
+sudo apt-get install -y python wget
+sudo sleep 10;
+
+# Format attached disks
+sudo mkfs.ext4 /dev/xvdh
+
+# Create folders & mount disks
+sudo mkdir -p /mnt/influxdb/meta/data
+sudo mount /dev/xvdh /mnt/influxdb/meta/data
+
+# Create script to mount disks at startup
+echo 'echo # influxdb-meta-disk >> /etc/fstab' >> /tmp/disks.sh
+echo 'echo /dev/xvdh    /mnt/influxdb/meta/data    ext4    defaults    0    2 >> /etc/fstab' >> /tmp/disks.sh
+
+# Mount disks at startup
+sudo bash /tmp/disks.sh
+
+# Download, install and start InfluxDB meta-nodes
+sudo wget -O /tmp/influxdb-meta_1.8.6-c1.8.6_amd64.deb https://dl.influxdata.com/enterprise/releases/influxdb-meta_1.8.6-c1.8.6_amd64.deb
+sleep 5;
+sudo dpkg -i /tmp/influxdb-meta_1.8.6-c1.8.6_amd64.deb
+sleep 5;
+sudo systemctl start influxdb-meta

main.tf

@@ -1,126 +1,113 @@
-# Used to obtain availabilty zones when creating persistent storage.
-data "aws_subnet" "selected" {
-  count = "${length(var.subnet_ids)}"
-  id = "${var.subnet_ids[count.index]}"
-}
-
 # Create data nodes, equally distrubting them across specified subnets / AVs
 resource "aws_instance" "data_node" {
-    ami                         = "${var.ami}"
-    instance_type               = "${var.instance_type}"
-    tags                        = "${merge(var.tags, map("Name", "${var.name}-data${format("%02d", count.index + 1)}"), map("Role", "${replace(var.name, "-", "_")}_data"), map("Type", "data"))}"
-    subnet_id                   = "${element(var.subnet_ids, count.index)}"
-    key_name                    = "${var.key_name}"
-    user_data                   = "${var.user_data == "" ? file("${path.module}/files/init.sh") : var.user_data }"
-    ebs_optimized               = true
-    vpc_security_group_ids      = ["${concat(list(aws_security_group.influx_cluster.id, aws_security_group.data_node.id), var.security_groups)}"]
-    count                       = "${var.data_instances}"
+  ami                    = var.ami
+  instance_type          = var.instance_type
+  subnet_id              = var.subnet_id
+  key_name               = var.key_name
+  user_data              = var.user_data == "" ? file("${path.module}/init/data-nodes.sh") : var.user_data
+  ebs_optimized          = true
+  vpc_security_group_ids = var.security_group
+  count                  = var.data_instances
 }
 
 resource "aws_ebs_volume" "data" {
-    size              = "${var.data_disk_size}"
-    encrypted         = true
-    type              = "io1"
-    iops              = "${var.data_disk_iops}"
-    availability_zone = "${element(data.aws_subnet.selected.*.availability_zone, count.index)}"
-    tags              = "${var.tags}"
-    count             = "${var.data_instances}"
+  size              = var.data_disk_size
+  encrypted         = true
+  type              = "io1"
+  iops              = var.data_disk_iops
+  availability_zone = var.availabity_zone
+  count             = var.data_instances
 }
 
 resource "aws_volume_attachment" "data_attachment" {
-    device_name = "${var.data_disk_device_name}"
-    volume_id   = "${aws_ebs_volume.data.*.id[count.index]}"
-    instance_id = "${aws_instance.data_node.*.id[count.index]}"
-    count       = "${var.data_instances}"
-    force_detach = true
+  device_name  = var.data_disk_device_name
+  volume_id    = aws_ebs_volume.data.*.id[count.index]
+  instance_id  = aws_instance.data_node.*.id[count.index]
+  count        = var.data_instances
+  force_detach = true
 }
 
-
 # Creates all meta nodes in the first / same subnet, this avoids splits if one AV goes offline.
 # Data nodes function fine without access to meta-nodes between shard creation.
-resource "aws_instance" "meta_node" {
-    ami                         = "${var.ami}"
-    instance_type               = "t2.medium"
-    tags                        = "${merge(var.tags, map("Name", "${var.name}-meta${format("%02d", count.index + 1)}"), map("Role", "${replace(var.name, "-", "_")}_meta"), map("Type", "data"))}"
-    subnet_id                   = "${element(var.subnet_ids,0)}"
-    key_name                    = "${var.key_name}"
-    user_data                   = "${var.user_data == "" ? file("${path.module}/files/init.sh") : var.user_data }"
-    vpc_security_group_ids      = ["${concat(list(aws_security_group.influx_cluster.id), var.security_groups)}"]
-    count                       = "${var.meta_instances}"
-}
+ resource "aws_instance" "meta_node" {
+     ami                         = var.ami
+     instance_type               = "t2.medium"
+     subnet_id                   = var.subnet_id
+     key_name                    = var.key_name
+     user_data                   = var.user_data == "" ? file("${path.module}/init/meta-nodes.sh") : var.user_data
+     vpc_security_group_ids      = var.security_group
+     count                       = var.meta_instances
+ }
 
-resource "aws_ebs_volume" "meta" {
-    size              = "100"
-    encrypted         = true
-    type              = "io1"
-    iops              = "4000"
-    availability_zone = "${data.aws_subnet.selected.0.availability_zone}"
-    tags              = "${var.tags}"
-    count             = "${var.meta_instances}"
-}
+ resource "aws_ebs_volume" "meta" {
+     size              = "100"
+     encrypted         = true
+     type              = "io1"
+     iops              = var.data_disk_iops
+     availability_zone = var.availabity_zone
+     count             = var.meta_instances
+ }
 
-resource "aws_volume_attachment" "meta" {
-    device_name = "${var.meta_disk_device_name}"
-    volume_id   = "${aws_ebs_volume.meta.*.id[count.index]}"
-    instance_id = "${aws_instance.meta_node.*.id[count.index]}"
-    count       = "${var.meta_instances}"
-    force_detach = true
-}
+ resource "aws_volume_attachment" "meta" {
+     device_name = var.meta_disk_device_name
+     volume_id   = aws_ebs_volume.meta.*.id[count.index]
+     instance_id = aws_instance.meta_node.*.id[count.index]
+     count       = var.meta_instances
+     force_detach = true
+ }
 
 resource "aws_route53_record" "meta_node" {
-    zone_id = "${var.zone_id}"
-    name    = "${var.name}-meta${format("%02d", count.index + 1)}"
-    type    = "A"
-    ttl     = "120"
-    records = ["${element(aws_instance.meta_node.*.private_ip, count.index)}"]
-    count   = "${var.meta_instances}"
-}
+     zone_id = var.zone_id
+     name    = "${var.name}-meta${format("%02d", count.index + 1)}"
+     type    = "A"
+     ttl     = "120"
+     records = ["${element(aws_instance.meta_node.*.private_ip, count.index)}"]
+     count   = var.meta_instances
+ }
 
-resource "aws_route53_record" "data_node" {
-    zone_id = "${var.zone_id}"
-    name    = "${var.name}-data${format("%02d", count.index + 1)}"
-    type    = "A"
-    ttl     = "120"
-    records = ["${element(aws_instance.data_node.*.private_ip, count.index)}"]
-    count   = "${var.data_instances}"
-}
+ resource "aws_route53_record" "data_node" {
+     zone_id = var.zone_id
+     name    = "${var.name}-data${format("%02d", count.index + 1)}"
+     type    = "A"
+     ttl     = "120"
+     records = ["${element(aws_instance.data_node.*.private_ip, count.index)}"]
+     count   = var.data_instances
+ }
 
 
 # Setup inter-node cluster communications.
-resource "aws_security_group" "influx_cluster" {
-    name        = "${var.name}_cluster"
-    description = "Rules required for an Influx Enterprise Cluster"
-    tags        = "${merge(var.tags, map("Name", "${var.name}"), map("Role", "influx"))}"
-    vpc_id      = "${var.vpc_id}"
-}
+ resource "aws_security_group" "influxdb_cluster" {
+     name        = "${var.name}_cluster"
+     description = "Rules required for an Influx Enterprise Cluster"
+     vpc_id      = "${var.vpc_id}"
+ }
 
-resource "aws_security_group_rule" "cluster_comms" {
-  type              = "ingress"
-  from_port         = 8088
-  to_port           = 8091
-  protocol          = "tcp"
-  cidr_blocks       = ["${formatlist("%s/32", concat(aws_instance.meta_node.*.private_ip, aws_instance.data_node.*.private_ip))}"]
-  security_group_id = "${aws_security_group.influx_cluster.id}"
-}
+ resource "aws_security_group_rule" "cluster_comms" {
+   type              = "ingress"
+   from_port         = 8088
+   to_port           = 8091
+   protocol          = "tcp"
+   cidr_blocks       = "${formatlist("%s/32", concat(aws_instance.meta_node.*.private_ip, aws_instance.data_node.*.private_ip))}"
+   security_group_id = "${aws_security_group.influxdb_cluster.id}"
+ }
 
 resource "aws_security_group_rule" "outbound" {
-  type              = "egress"
-  to_port           = 0
-  protocol          = "-1"
-  from_port         = 0
-  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${aws_security_group.influx_cluster.id}"
-}
+   type              = "egress"
+   to_port           = 0
+   protocol          = "-1"
+   from_port         = 0
+   cidr_blocks       = ["0.0.0.0/0"]
+   security_group_id = "${aws_security_group.influxdb_cluster.id}"
+ }
 
 resource "aws_security_group" "data_node" {
-    description = "Security group for influx data node ingress"
-    vpc_id      = "${var.vpc_id}"
-    tags        = "${merge(var.tags, map("Name", "${var.name}"), map("Role", "influx"))}"
-
-    ingress {
-        from_port   = "8086"
-        to_port     = "8086"
-        protocol    = "tcp"
-        cidr_blocks = ["0.0.0.0/0"]
-    }
-}
+     description = "Security group for influx data node ingress"
+     vpc_id      = var.vpc_id
+
+     ingress {
+         from_port   = "8086"
+         to_port     = "8086"
+         protocol    = "tcp"
+         cidr_blocks = ["0.0.0.0/0"]
+     }
+ }

outputs.tf

@@ -10,5 +10,5 @@ output "data_node_ids" {
 
 output "data_node_count" {
   description = "Yields the data node count, this can be used in conjunction with modules that configure load balancers etc"
-  value = "${var.data_instances}"
+  value = var.data_instances
 }