This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 7e25dcb fixed issue with keystore
7e25dcb is described below
commit 7e25dcb4017391507e4821fa15bff53c88d31af4
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Oct 30 10:17:00 2019 +0200
fixed issue with keystore
---
.../terraform/aws/endpoint/main/instance.tf | 14 +++++-----
.../terraform/aws/endpoint/main/network.tf | 18 ++++++------
.../terraform/aws/endpoint/main/outputs.tf | 6 ++--
.../terraform/aws/ssn-k8s/main/outputs.tf | 18 ++++++------
.../terraform/aws/ssn-k8s/main/vpc.tf | 32 +++++++++++-----------
infrastructure-provisioning/terraform/bin/dlab.py | 6 ++--
6 files changed, 47 insertions(+), 47 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
b/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
index c072924..34dd37f 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/instance.tf
@@ -44,14 +44,14 @@ resource "aws_instance" "endpoint" {
}
}
-resource "aws_eip_association" "e_ip_assoc" {
- instance_id = aws_instance.endpoint.id
- allocation_id = var.endpoint_eip_allocation_id
- count = var.network_type == "public" ? 1 : 0
-}
-
//resource "aws_eip_association" "e_ip_assoc" {
// instance_id = aws_instance.endpoint.id
-// allocation_id = aws_eip.endpoint_eip.id
+// allocation_id = var.endpoint_eip_allocation_id
// count = var.network_type == "public" ? 1 : 0
//}
+
+resource "aws_eip_association" "e_ip_assoc" {
+ instance_id = aws_instance.endpoint.id
+ allocation_id = aws_eip.endpoint_eip.id
+ count = var.network_type == "public" ? 1 : 0
+}
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
index 3978e04..892ffae 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
@@ -128,12 +128,12 @@ resource "aws_security_group" "endpoint_sec_group" {
}
}
-//resource "aws_eip" "endpoint_eip" {
-// vpc = true
-// tags = {
-// Name = local.endpoint_ip_name
-// "${local.additional_tag[0]}" = local.additional_tag[1]
-// "${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_ip_name}"
-// "${var.service_base_name}-Tag" = local.endpoint_ip_name
-// }
-//}
+resource "aws_eip" "endpoint_eip" {
+ vpc = true
+ tags = {
+ Name = local.endpoint_ip_name
+ "${local.additional_tag[0]}" = local.additional_tag[1]
+ "${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_ip_name}"
+ "${var.service_base_name}-Tag" = local.endpoint_ip_name
+ }
+}
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/outputs.tf
b/infrastructure-provisioning/terraform/aws/endpoint/main/outputs.tf
index 579ccfc..caa3527 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/outputs.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/outputs.tf
@@ -19,6 +19,6 @@
#
#
******************************************************************************
-//output "endpoint_eip_address" {
-// value = aws_eip.endpoint_eip.public_ip
-//}
\ No newline at end of file
+output "endpoint_eip_address" {
+ value = aws_eip.endpoint_eip.public_ip
+}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/outputs.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/outputs.tf
index f2a7f1e..be4401e 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/outputs.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/outputs.tf
@@ -44,15 +44,15 @@ output "ssn_subnet" {
output "ssn_k8s_sg_id" {
value = aws_security_group.ssn_k8s_sg.id
}
-# TEMPORARY
-output "endpoint_eip_allocation_id" {
- value = aws_eip.k8s-endpoint-eip.id
-}
-
-output "endpoint_eip_address" {
- value = aws_eip.k8s-endpoint-eip.public_ip
-}
-# TEMPORARY
+//# TEMPORARY
+//output "endpoint_eip_allocation_id" {
+// value = aws_eip.k8s-endpoint-eip.id
+//}
+//
+//output "endpoint_eip_address" {
+// value = aws_eip.k8s-endpoint-eip.public_ip
+//}
+//# TEMPORARY
//output "ssn_keystore_password" {
// value = random_string.ssn_keystore_password.result
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
index 87a6e74..24178ea 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/vpc.tf
@@ -26,9 +26,9 @@ locals {
ssn_subnet_a_name = "${var.service_base_name}-ssn-subnet-az-a"
ssn_subnet_b_name = "${var.service_base_name}-ssn-subnet-az-b"
ssn_subnet_c_name = "${var.service_base_name}-ssn-subnet-az-c"
- # TEMPORARY
- endpoint_ip_name = "${var.service_base_name}-endpoint-eip"
- # TEMPORARY
+// # TEMPORARY
+// endpoint_ip_name = "${var.service_base_name}-endpoint-eip"
+// # TEMPORARY
endpoint_rt_name = "${var.service_base_name}-endpoint-rt"
endpoint_s3_name = "${var.service_base_name}-endpoint-s3"
}
@@ -134,19 +134,19 @@ data "aws_subnet" "k8s-subnet-c-data" {
id = aws_subnet.ssn_k8s_subnet_c.0.id
}
-# TEMPORARY
-
-resource "aws_eip" "k8s-endpoint-eip" {
- vpc = true
- tags = {
- Name = local.endpoint_ip_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_ip_name}"
- "${var.service_base_name}-Tag" = local.endpoint_ip_name
- }
-}
-
-# TEMPORARY
+//# TEMPORARY
+//
+//resource "aws_eip" "k8s-endpoint-eip" {
+// vpc = true
+// tags = {
+// Name = local.endpoint_ip_name
+// "${local.additional_tag[0]}" = local.additional_tag[1]
+// "${var.tag_resource_id}" =
"${var.service_base_name}:${local.endpoint_ip_name}"
+// "${var.service_base_name}-Tag" = local.endpoint_ip_name
+// }
+//}
+//
+//# TEMPORARY
resource "aws_route_table" "ssn-k8s-users-route-table" {
vpc_id = data.aws_vpc.ssn_k8s_vpc_data.id
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py
b/infrastructure-provisioning/terraform/bin/dlab.py
index 39c7336..1e19b50 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -956,9 +956,9 @@ class AWSEndpointBuilder(AbstractDeployBuilder):
default='t2.medium', group='endpoint')
.add_int('--endpoint_volume_size', 'Size of root volume in GB.',
default=30, group='endpoint')
- .add_str('--endpoint_eip_allocation_id',
- 'Elastic Ip created for Endpoint',
- group='endpoint')
+ # .add_str('--endpoint_eip_allocation_id',
+ # 'Elastic Ip created for Endpoint',
+ # group='endpoint')
.add_str('--product', 'Product name.', default='dlab',
group='endpoint')
.add_str('--additional_tag', 'Additional tag.',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
