basic node setup complete

main.tf

@@ -22,50 +22,22 @@ module "nodes" {
   region           = var.region
   profile          = var.profile
   open-nets        = ["76.14.80.208/32"]
-<<<<<<< HEAD
   data-node-count  = 3
-  re-volume-size   = 500
-  re-instance-type = "m5.xlarge"
-=======
-  data-node-count  = 5
-  re-volume-size   = 250
-  re-instance-type = "m5.4xlarge"
->>>>>>> 650c625a384961385a2361e14ba70eeeceb21a30
+  enable-volumes   = false
+  re-instance-type = "m5a.xlarge"
   vpc-cidr         = var.vpc-cidr
   vpc-azs          = var.vpc-azs
   vpc-name         = var.vpc-name
   vpc-id           = module.vpc.vpc-id
   vpc-subnets      = module.vpc.subnets-public
   allow-public-ssh = 1
-  enable-flash     = true
+  enable-flash     = false
   common-tags = {
     "Owner"   = "maguec"
     "Project" = "AWS Testing Environment"
   }
 }
 
-<<<<<<< HEAD
-module "tmuxer" {
-  source  = "../tfmodule-cloud-tmux"
-  ssh-key = "${var.vpc-name}.pem"
-  user    = "ubuntu"
-  nodes   = module.nodes.node-ips
-  outpath = "."
-}
-
-module "dns-lb" {
-  source       = "../tfmodule-aws-dns-lb"
-  profile      = var.profile
-  region       = var.region
-  vpc-subnets  = module.vpc.subnets-public
-  vpc-id       = module.vpc.vpc-id
-  node-ids     = module.nodes.node-ids
-  cluster-name = "maguetest.redisdemo.com"
-  common-tags = {
-    "Owner"   = "maguec"
-    "Project" = "AWS Testing Environment"
-  }
-=======
 module "tmux" {
   source       = "../tfmodule-cloud-tmux"
   session-name = "cpredis"
@@ -80,7 +52,7 @@ module "tmux" {
 
 resource "aws_instance" "re" {
   ami                    = data.aws_ami.re-ami.id
-  instance_type          = "m5.4xlarge"
+  instance_type          = "m5a.xlarge"
   availability_zone      = "${element(var.vpc-azs, 1)}"
   subnet_id              = "${element(module.vpc.subnets-public, 1)}"
   vpc_security_group_ids = [module.nodes.re-security-group]
@@ -91,8 +63,8 @@ resource "aws_instance" "re" {
 }
 
 resource "aws_eip" "re-eip" {
-  vpc   = true
-  tags  = merge({ Name = "${var.vpc-name}-node-eip-1" }, var.common-tags)
+  vpc  = true
+  tags = merge({ Name = "${var.vpc-name}-node-eip-1" }, var.common-tags)
 }
 
 resource "aws_eip_association" "re-eip-assoc" {
@@ -115,15 +87,6 @@ resource "null_resource" "remote-config" {
   depends_on = ["aws_instance.re", "aws_eip_association.re-eip-assoc"]
 }
 
-
-output "node-ips" {
-  value = formatlist("ssh -i ~/.ssh/${var.vpc-name}.pem -o IdentitiesOnly=yes  -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@%s", module.nodes.node-ips)
-}
-
-output "tester-ips" {
-  value = formatlist("ssh -i ~/.ssh/${var.vpc-name}.pem -o IdentitiesOnly=yes  -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@%s", aws_eip.re-eip.public_ip)
-}
-
 output "tmux" {
   value = "run ./cloud-tmux to enable tmux connections"
 }
@@ -134,8 +97,6 @@ data "template_file" "raft_group_setup" {
     node1 = module.nodes.node-internal-ips[0]
     node2 = module.nodes.node-internal-ips[1]
     node3 = module.nodes.node-internal-ips[2]
-    node4 = module.nodes.node-internal-ips[3]
-    node5 = module.nodes.node-internal-ips[4]
   }
 }
 
@@ -144,7 +105,6 @@ resource "null_resource" "raft_group_setup" {
     command = "echo \"${data.template_file.raft_group_setup.rendered}\" > ${path.module}/ansible/raft_group_setup"
   }
   depends_on = ["data.template_file.raft_group_setup"]
->>>>>>> 650c625a384961385a2361e14ba70eeeceb21a30
 }
 
 

raft_group_setup.tpl

@@ -7,8 +7,6 @@
 #  ${node1}
 #  ${node2}
 #  ${node3}
-#  ${node4}
-#  ${node5}
 #  
 #  Run once from from any node
 #############################################################################
@@ -32,61 +30,36 @@ redis-cli -h ${node3} -p 19912 raft.cluster init
 # setup groups
 redis-cli -h ${node2} -p 19901 raft.cluster join ${node1}:19901
 redis-cli -h ${node3} -p 19901 raft.cluster join ${node1}:19901
-redis-cli -h ${node4} -p 19901 raft.cluster join ${node1}:19901
-redis-cli -h ${node5} -p 19901 raft.cluster join ${node1}:19901
 
 redis-cli -h ${node2} -p 19902 raft.cluster join ${node1}:19902
 redis-cli -h ${node3} -p 19902 raft.cluster join ${node1}:19902
-redis-cli -h ${node4} -p 19902 raft.cluster join ${node1}:19902
-redis-cli -h ${node5} -p 19902 raft.cluster join ${node1}:19902
 
 redis-cli -h ${node2} -p 19903 raft.cluster join ${node1}:19903
 redis-cli -h ${node3} -p 19903 raft.cluster join ${node1}:19903
-redis-cli -h ${node4} -p 19903 raft.cluster join ${node1}:19903
-redis-cli -h ${node5} -p 19903 raft.cluster join ${node1}:19903
 
 redis-cli -h ${node2} -p 19904 raft.cluster join ${node1}:19904
 redis-cli -h ${node3} -p 19904 raft.cluster join ${node1}:19904
-redis-cli -h ${node4} -p 19904 raft.cluster join ${node1}:19904
-redis-cli -h ${node5} -p 19904 raft.cluster join ${node1}:19904
 
 redis-cli -h ${node1} -p 19905 raft.cluster join ${node2}:19905
 redis-cli -h ${node3} -p 19905 raft.cluster join ${node2}:19905
-redis-cli -h ${node4} -p 19905 raft.cluster join ${node2}:19905
-redis-cli -h ${node5} -p 19905 raft.cluster join ${node2}:19905
 
 redis-cli -h ${node1} -p 19906 raft.cluster join ${node2}:19906
 redis-cli -h ${node3} -p 19906 raft.cluster join ${node2}:19906
-redis-cli -h ${node4} -p 19906 raft.cluster join ${node2}:19906
-redis-cli -h ${node5} -p 19906 raft.cluster join ${node2}:19906
 
 redis-cli -h ${node1} -p 19907 raft.cluster join ${node2}:19907
 redis-cli -h ${node3} -p 19907 raft.cluster join ${node2}:19907
-redis-cli -h ${node4} -p 19907 raft.cluster join ${node2}:19907
-redis-cli -h ${node5} -p 19907 raft.cluster join ${node2}:19907
 
 redis-cli -h ${node1} -p 19908 raft.cluster join ${node2}:19908
 redis-cli -h ${node3} -p 19908 raft.cluster join ${node2}:19908
-redis-cli -h ${node4} -p 19908 raft.cluster join ${node2}:19908
-redis-cli -h ${node5} -p 19908 raft.cluster join ${node2}:19908
 
 redis-cli -h ${node1} -p 19909 raft.cluster join ${node3}:19909
 redis-cli -h ${node2} -p 19909 raft.cluster join ${node3}:19909
-redis-cli -h ${node4} -p 19909 raft.cluster join ${node3}:19909
-redis-cli -h ${node5} -p 19909 raft.cluster join ${node3}:19909
 
 redis-cli -h ${node1} -p 19910 raft.cluster join ${node3}:19910
 redis-cli -h ${node2} -p 19910 raft.cluster join ${node3}:19910
-redis-cli -h ${node4} -p 19910 raft.cluster join ${node3}:19910
-redis-cli -h ${node5} -p 19910 raft.cluster join ${node3}:19910
 
 redis-cli -h ${node1} -p 19911 raft.cluster join ${node3}:19911
 redis-cli -h ${node2} -p 19911 raft.cluster join ${node3}:19911
-redis-cli -h ${node4} -p 19911 raft.cluster join ${node3}:19911
-redis-cli -h ${node5} -p 19911 raft.cluster join ${node3}:19911
 
 redis-cli -h ${node1} -p 19912 raft.cluster join ${node3}:19912
-redis-cli -h ${node2} -p 19912 raft.cluster join ${node3}:19912
-redis-cli -h ${node4} -p 19912 raft.cluster join ${node3}:19912
-redis-cli -h ${node5} -p 19912 raft.cluster join ${node3}:19912
-
+redis-cli -h ${node2} -p 19912 raft.cluster join ${node3}:19912