From 38cb72a3ce8ca4d78136c05c9c11293068181da2 Mon Sep 17 00:00:00 2001 From: Jessie Morris Date: Wed, 6 Feb 2019 11:46:31 -0500 Subject: [PATCH] SMRT-890-Consumes newest version of iam module with load balancer to handle ldaps --- .gitignore | 4 ++++ iam.tf | 13 ++++++++++++- providers.tf | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1c99dc1..6cb8210 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ .terraform/ +terraform.tfstate.d +*.out +config-map-aws-auth_streaming-kube-*.yaml +kubeconfig_streaming-kube-* \ No newline at end of file diff --git a/iam.tf b/iam.tf index 3d06012..e68766a 100644 --- a/iam.tf +++ b/iam.tf @@ -1,5 +1,5 @@ module "iam_stack" { - source = "git@github.com:SmartColumbusOS/scos-tf-iam?ref=1.0.0" + source = "git@github.com: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}"] +} diff --git a/providers.tf b/providers.tf index f10ba09..27d8a09 100644 --- a/providers.tf +++ b/providers.tf @@ -23,7 +23,7 @@ provider "template" { } provider "aws" { - version = "1.39" + version = "1.57" region = "${var.region}" assume_role {