Merge pull request #7 from SmartColumbusOS/smrt-890

SMRT-890-Consumes newest version of iam module with load balancer to …

.gitignore

@@ -1 +1,5 @@
 .terraform/
+terraform.tfstate.d
+*.out
+config-map-aws-auth_streaming-kube-*.yaml
+kubeconfig_streaming-kube-*

iam.tf

@@ -1,5 +1,5 @@
 module "iam_stack" {
-  source                  = "[email protected]:SmartColumbusOS/scos-tf-iam?ref=1.0.0"
+  source                  = "[email protected]:SmartColumbusOS/scos-tf-iam?ref=1.1.0"
   vpc_id                  = "${module.vpc.vpc_id}"
   subnet_ids              = ["${module.vpc.private_subnets}"]
   ssh_key                 = "${aws_key_pair.cloud_key.key_name}"
@@ -12,6 +12,7 @@ module "iam_stack" {
   vpc_cidr                = "${var.vpc_cidr}"
   freeipa_replica_count   = "${var.freeipa_replica_count}"
   recovery_window_in_days = "${var.recovery_window_in_days}"
+  alb_certificate         = "${module.tls_certificate.arn}"
 
   extra_users_count       = 3
   extra_users             = [
@@ -125,3 +126,13 @@ output "discovery_api_user_password_secret_id" {
 output "reverse_dns_zone_id" {
   value = "${module.iam_stack.reverse_dns_zone_id}"
 }
+
+output "freeipa_master_instance_id" {
+  description = "The instance id the iam-master ec2 instance"
+  value = "${module.iam_stack.freeipa_master_instance_id}"
+}
+
+output "freeipa_replica_instance_ids" {
+  description = "The instance id the iam-master ec2 instance"
+  value = ["${module.iam_stack.freeipa_replica_instance_ids}"]
+}

providers.tf

@@ -23,7 +23,7 @@ provider "template" {
 }
 
 provider "aws" {
-  version = "1.39"
+  version = "1.57"
   region  = "${var.region}"
 
   assume_role {