update

Author: Scott Winkler

modules/cluster/main.tf

@@ -1,6 +1,6 @@
 
 module "iam_instance_profile" {
-  source  = "scottwinkler/iip/aws"
+  source  = "terraform-in-action/iip/aws"
   actions = ["logs:*", "ec2:DescribeInstances"]
 }
 

modules/cluster/templates/startup.sh

@@ -114,7 +114,6 @@ if [[  ${nomad_mode} != "disabled" ]]; then
   installNomad ${nomad_version}
 fi
 
-
 if [[  ${nomad_mode} == "client" ]]; then
   installDocker
 fi

modules/loadbalancing/main.tf

@@ -90,11 +90,6 @@ resource "aws_lb_target_group" "fabio_ui" {
   protocol = "TCP"
   vpc_id   = var.vpc.vpc_id
 
-  stickiness {
-    type = "lb_cookie"
-    enabled = false
-  }
-
   health_check {
     port = 4646
   }
@@ -121,11 +116,6 @@ resource "aws_lb_target_group" "fabio_lb" {
   protocol = "TCP"
   vpc_id   = var.vpc.vpc_id
 
-  stickiness {
-    type = "lb_cookie"
-    enabled = false
-  }
-
   tags = {
     ResourceGroup = var.namespace
   }
@@ -152,11 +142,6 @@ resource "aws_lb_target_group" "fabio_db" {
   protocol = "TCP"
   vpc_id   = var.vpc.vpc_id
 
-  stickiness {
-    type = "lb_cookie"
-    enabled = false
-  }
-
   tags = {
     ResourceGroup = var.namespace
   }

modules/networking/main.tf

@@ -2,13 +2,12 @@ data "aws_availability_zones" "available" {}
 
 module "vpc" {
   source                           = "terraform-aws-modules/vpc/aws"
-  version                          = "2.5.0"
+  version                          = "2.70.0"
   name                             = "${var.namespace}-vpc"
   cidr                             = "10.0.0.0/16"
   azs                              = data.aws_availability_zones.available.names
   private_subnets                  = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
   public_subnets                   = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
-  assign_generated_ipv6_cidr_block = true
   enable_nat_gateway               = true
   single_nat_gateway               = true
   tags = {
@@ -17,7 +16,7 @@ module "vpc" {
 }
 
 module "consul_server_sg" {
-  source = "scottwinkler/sg/aws"
+  source = "terraform-in-action/sg/aws"
   vpc_id = module.vpc.vpc_id
   ingress_rules = [
     {
@@ -44,7 +43,7 @@ module "consul_server_sg" {
 }
 
 module "consul_lb_sg" {
-  source = "scottwinkler/sg/aws"
+  source = "terraform-in-action/sg/aws"
   vpc_id = module.vpc.vpc_id
   ingress_rules = [
     {
@@ -55,7 +54,7 @@ module "consul_lb_sg" {
 }
 
 module "nomad_server_sg" {
-  source = "scottwinkler/sg/aws"
+  source = "terraform-in-action/sg/aws"
   vpc_id = module.vpc.vpc_id
   ingress_rules = [
     {
@@ -86,7 +85,7 @@ module "nomad_server_sg" {
 }
 
 module "nomad_lb_sg" {
-  source = "scottwinkler/sg/aws"
+  source = "terraform-in-action/sg/aws"
   vpc_id = module.vpc.vpc_id
   ingress_rules = [
     {
@@ -97,7 +96,7 @@ module "nomad_lb_sg" {
 }
 
 module "nomad_client_sg" {
-  source = "scottwinkler/sg/aws"
+  source = "terraform-in-action/sg/aws"
   vpc_id = module.vpc.vpc_id
   ingress_rules = [
     {
@@ -140,7 +139,7 @@ module "nomad_client_sg" {
 }
 
 module "fabio_lb_sg" {
-  source = "scottwinkler/sg/aws"
+  source = "terraform-in-action/sg/aws"
   vpc_id = module.vpc.vpc_id
   ingress_rules = [
     {