Merge branch 'master' into ansible-test

- Made the qemu-agent content in the cloud-init config to be controlled
  by a 'install-qemu-agent' flag.

main.tf

@@ -1,3 +1,12 @@
+terraform {
+  required_version = ">= 1.0.8"
+  required_providers {
+    libvirt = {
+      source  = "dmacvicar/libvirt"
+      version = "0.6.11"
+    }
+  }
+}
 
 locals {
   nodes-config = {
@@ -34,6 +43,10 @@ module "cloud-init-config" {
 # libvirt modules/resources.
 ################################################################################
 
+provider "aws" {
+  region = "us-east-2"
+}
+
 # This module will grab the latest ami for a variety of distros. Uncomment to
 # get a list of the latest AMIs for our supported distros.
 # module "aws-amis" {
@@ -43,27 +56,14 @@ module "cloud-init-config" {
 #   value = module.aws-amis.amis
 # }
 
-################################################################################
-# AWS Networking
-# Use of the 2 modules below to create resources for the AWS network.
-# aws-network-from-scratch will build the AWS network from scratch.
-# aws-network-existing will query AWS for an existing VPC.
-################################################################################
-
-# module "aws-network-from-scratch" {
-#   source            = "./modules/aws-network-from-scratch"
-#   name-prefix       = var.vm-name-prefix
-#   vpc-cidr-block    = var.aws-vpc-cidr-block
-#   subnet-cidr-block = var.aws-subnet-cidr-block
-#   admin-ips         = var.admin-ips
-# }
-
-module "aws-network-existing" {
-  source = "./modules/aws-network-existing"
+module "aws-network" {
+  source            = "./modules/aws-network"
+  name-prefix       = var.vm-name-prefix
+  vpc-cidr-block    = var.aws-vpc-cidr-block
+  subnet-cidr-block = var.aws-subnet-cidr-block
+  admin-ips         = var.admin-ips
 }
 
-################################################################################
-
 # This key pair is not actually used. Keys are added to the nodes via cloud-init
 # instead. We just add this here that this key will show up in the AWS console."
 resource "aws_key_pair" "key" {
@@ -127,7 +127,7 @@ module "nodes" {
 # end libvirt
 ################################################################################
 
-# This will output a map of group => [{hostname, ip}].
+# This will outpus a map of group => [{hostname, ip}].
 # TODO A 'names' output needs to be added to libvirt.
 output "groups_hostnames_ips" {
   value = { for type, node in module.nodes : type => zipmap(node.names, node.ips) }

modules/aws-network-existing/main.tf

@@ -1,23 +0,0 @@
-locals {
-  az-to-subnets = {
-    for s in data.aws_subnet.subnets : s.availability_zone => s.id...
-  }
-}
-
-data "aws_vpc" "default" {
-  tags = {
-    Name = var.default-vpc-name
-  }
-}
-
-data "aws_subnets" "subnet-ids" {
-  filter {
-    name = "vpc-id"
-    values = [data.aws_vpc.default.id]
-  }
-}
-
-data "aws_subnet" "subnets" {
-  for_each = toset(data.aws_subnets.subnet-ids.ids)
-  id = each.key
-}

modules/aws-network-existing/outputs.tf

@@ -1,18 +0,0 @@
-output "default-vpc" {
-  value = data.aws_vpc.default
-}
-
-output "subnets" {
-  description = "An array of all subnets in default-vpc."
-  value = data.aws_subnet.subnets
-}
-
-output "k8s-subnets" {
-  description = "An array of subnets to be used for k8s VMs. These subnets were chosen by selecting a single subnet from each availability_zone."
-  value = [for k,v in local.az-to-subnets : v[0]]
-}
-
-output "az-to-subnets" {
-  description = "A map of availability zone to array of subnets that are in thet availability zone."
-  value = local.az-to-subnets
-}

modules/aws-network-existing/variables.tf

@@ -1,4 +0,0 @@
-variable "default-vpc-name" {
-  description = "The name of the existing default VPC. This module will query AWS for a VPC with this name,"
-  default = "Managed VPC"
-}

modules/aws-nodes/main.tf

@@ -1,7 +1,6 @@
 resource "aws_instance" "nodes" {
   ami                         = var.ami
   instance_type               = var.ec2-instance-type
-  # TODO REM double check this key.
   # key_name                    = aws_key_pair.debug1.key_name
   associate_public_ip_address = true
   subnet_id                   = var.subnet-id

providers.tf

@@ -1,76 +0,0 @@
-
-provider "aws" {
-  region = "us-gov-west-1"
-}
-
-
-terraform {
-  required_version = ">= 1.0.8"
-
-    backend "s3" {
-      
-      bucket            = "mss-terraform-state"
-      key               = "global/s3/terraform.tfstate"
-      region            = "us-gov-west-1"
-      
-      dynamodb_table    = "mss-terraform-state-lock"
-      encrypt           = true
-
-  }
-  required_providers {
-    libvirt = {
-      source  = "dmacvicar/libvirt"
-      version = "0.6.11"
-    }
-  }
-}
-
-
-
-
-
-##
-#S3 bucket create to hold our TFState file so we can all share env settings
-resource "aws_s3_bucket" "terraform_state" {
-    bucket = "mss-terraform-state"
-
-    # enable versioning for the state files 
-    versioning {
-        enabled = true
-    }
-
-    #enable server-side encryption
-    server_side_encryption_configuration {
-      
-      rule {
-          apply_server_side_encryption_by_default {
-              sse_algorithm = "AES256"
-              }
-          }
-        } 
-}
-
-##
-# no sql database used so that we can lock the TFstate file in the S3 bucket to ensure two people 
-# are not running a terraform command at the same time 
-resource "aws_dynamodb_table" "terraform_locks" {
-    name            = "mss-terraform-state-lock"
-    billing_mode    = "PAY_PER_REQUEST"
-    hash_key        = "LockID"
-
-    attribute {
-      name = "LockID"
-      type = "S"
-    }
-
-
-}
-
-
-##
-# output variable to give details on the s3 bucket created
-#TODO: move to output.tf
-output "s3_bucket_arn" {
-  value       = aws_s3_bucket.terraform_state.arn
-  description = "The ARN of the S3 bucket"
-}

variables.tf

@@ -8,11 +8,6 @@ variable "aws-ec2-instance-type" {
   description = "The AWS instance type to use for all nodes."
 }
 
-variable "aws-region" {
-  default = "us-east-1"
-  description = "The AWS region to use."
-}
-
 variable "aws-subnet-cidr-block" {
   default = "10.0.1.0/24"
   description = "The address space to be used for this subnet."