[incubator-dlab] branch DLAB-terraform updated: added output

[om...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-terraform by this push:
     new 6fea408  added output
6fea408 is described below

commit 6fea408017aacbfd4902bfd474c2c90aba5389e5
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Wed Jul 10 11:08:31 2019 +0300

    added output
---
 infrastructure-provisioning/terraform/aws/main/main.tf   |  4 ++++
 .../terraform/aws/main/variables.tf                      |  1 +
 .../terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf | 16 +++++++++++++++-
 .../terraform/aws/modules/ssn-k8s/variables.tf           |  6 ++++--
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf b/infrastructure-provisioning/terraform/aws/main/main.tf
index 11eea40..4a98e59 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -140,4 +140,8 @@ module "endpoint" {
   network_type            = var.network_type
   vpc_cidr                = var.vpc_cidr
   endpoint_volume_size    = var.endpoint_volume_size
+}
+
+output "ssn_k8s_masters_ip_addresses" {
+  value = module.ssn-k8s.ssn_k8s_masters_ip_addresses
 }
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf b/infrastructure-provisioning/terraform/aws/main/variables.tf
index 0a9cb54..8f659c8 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -37,6 +37,7 @@ variable "key_name" {
   default = "BDCC-DSS-POC"
 }
 variable "allowed_cidrs" {
+  type = list
   default = ["0.0.0.0/0"]
 }
 variable "os_user" {
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
index 9877d25..6aa3e42 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/auto_scaling_groups.tf
@@ -114,4 +114,18 @@ resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_workers" {
       propagate_at_launch = true
     }
   ]
-}
\ No newline at end of file
+}
+
+data "aws_instances" "ssn_k8s_masters_instances" {
+  instance_tags = {
+    Name = aws_autoscaling_group.ssn_k8s_autoscaling_group_masters.name
+  }
+
+  instance_state_names = ["running"]
+  depends_on = [aws_autoscaling_group.ssn_k8s_autoscaling_group_masters]
+}
+
+output "ssn_k8s_masters_ip_addresses" {
+  value = data.aws_instances.ssn_k8s_masters_instances.public_ips
+  depends_on = [data.aws_instances.ssn_k8s_masters_instances]
+}
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
index cb16348..7660088 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
@@ -45,10 +45,12 @@ variable "ssn_k8s_workers_count" {}
 
 variable "ssn_root_volume_size" {}
 
-variable "allowed_cidrs" {}
+variable "allowed_cidrs" {
+  type = list
+}
 
 variable "ssn_k8s_masters_shape" {}
 
 variable "ssn_k8s_workers_shape" {}
 
-variable "os_user" {}
\ No newline at end of file
+variable "os_user" {}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org