You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/07/02 11:49:44 UTC
[incubator-dlab] branch DLAB-terraform updated: fixed issues
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 349b5a9 fixed issues
349b5a9 is described below
commit 349b5a976c7ef33be3c9d94a4368820f7ab226c1
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Jul 2 14:49:35 2019 +0300
fixed issues
---
.../terraform/aws/main/main.tf | 1 +
.../terraform/aws/main/variables.tf | 82 +++++++++++++++-------
.../terraform/aws/modules/data_engine/instance.tf | 4 +-
.../terraform/aws/modules/data_engine/variables.tf | 4 +-
.../terraform/aws/modules/notebook/instance.tf | 2 +-
.../aws/modules/ssn-k8s/auto_scaling_groups.tf | 20 +++---
6 files changed, 75 insertions(+), 38 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf b/infrastructure-provisioning/terraform/aws/main/main.tf
index 2d5b73d..d2a1a72 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -73,6 +73,7 @@ module "data_engine" {
key_name = "${var.key_name}"
cluster_name = "${var.cluster_name}"
slave_count = "${var.slave_count}"
+ ami = "${var.ami}"
}
module "emr" {
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf b/infrastructure-provisioning/terraform/aws/main/variables.tf
index 4490a53..5032928 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -43,11 +43,7 @@ variable "subnet_cidr" {
default = "172.31.0.0/24"
}
variable "ami" {
- type = "map"
- default = {
- "debian" = "ami-08692d171e3cf02d6",
- "redhat" = ""
- }
+ default = "ami-08692d171e3cf02d6"
}
variable "ssn_k8s_masters_count" {
default = 3
@@ -66,40 +62,78 @@ variable "ssn_k8s_workers_shape" {
default = "t2.medium"
}
-variable "endpoint_tag" {}
+variable "endpoint_tag" {
+ default = ""
+}
-variable "user_tag" {}
+variable "user_tag" {
+ default = ""
+}
-variable "custom_tag" {}
+variable "custom_tag" {
+ default = ""
+}
-variable "notebook_name" {}
+variable "notebook_name" {
+ default = ""
+}
-variable "product_name" {}
+variable "product_name" {
+ default = ""
+}
-variable "nb-sg_id" {}
+variable "nb-sg_id" {
+ default = ""
+}
-variable "note_profile_name" {}
+variable "note_profile_name" {
+ default = ""
+}
-variable "note_cidr_range" {}
+variable "note_cidr_range" {
+ default = ""
+}
-variable "traefik_cidr" {}
+variable "traefik_cidr" {
+ default = ""
+}
-variable "note_ami" {}
+variable "note_ami" {
+ default = ""
+}
-variable "instance_type" {}
+variable "instance_type" {
+ default = ""
+}
-variable "cluster_name" {}
+variable "cluster_name" {
+ default = ""
+}
-variable "slave_count" {}
+variable "slave_count" {
+ default = ""
+}
-variable "emr_template" {}
+variable "emr_template" {
+ default = ""
+}
-variable "master_shape" {}
+variable "master_shape" {
+ default = ""
+}
-variable "slave_shape" {}
+variable "slave_shape" {
+ default = ""
+}
-variable "instance_count" {}
+variable "instance_count" {
+ default = ""
+}
-variable "bid_price" {}
+variable "bid_price" {
+ default = ""
+}
-variable "source_instance_id" {}
\ No newline at end of file
+variable "source_instance_id" {
+ default = ""
+}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf b/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf
index a0d9b2c..fab902b 100644
--- a/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/data_engine/instance.tf
@@ -9,7 +9,7 @@ resource "aws_instance" "master" {
key_name = "${var.key_name}"
subnet_id = "${var.subnet_id}"
security_groups = ["${var.nb-sg_id}"]
- iam_instance_profile = "${var.iam_profile_name}"
+ iam_instance_profile = "${var.note_profile_name}"
tags = {
Name = "${local.cluster_name}-m"
Type = "master"
@@ -30,7 +30,7 @@ resource "aws_instance" "slave" {
key_name = "${var.key_name}"
subnet_id = "${var.subnet_id}"
security_groups = ["${var.nb-sg_id}"]
- iam_instance_profile = "${var.iam_profile_name}"
+ iam_instance_profile = "${var.note_profile_name}"
tags = {
Name = "${local.cluster_name}-s${count.index + 1}"
Type = "slave"
diff --git a/infrastructure-provisioning/terraform/aws/modules/data_engine/variables.tf b/infrastructure-provisioning/terraform/aws/modules/data_engine/variables.tf
index b2e94fe..b62875f 100644
--- a/infrastructure-provisioning/terraform/aws/modules/data_engine/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/data_engine/variables.tf
@@ -24,4 +24,6 @@ variable "note_profile_name" {}
variable "cluster_name" {}
-variable "slave_count" {}
\ No newline at end of file
+variable "slave_count" {}
+
+variable "ami" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/modules/notebook/instance.tf b/infrastructure-provisioning/terraform/aws/modules/notebook/instance.tf
index 5b07c94..30a041d 100644
--- a/infrastructure-provisioning/terraform/aws/modules/notebook/instance.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/notebook/instance.tf
@@ -8,7 +8,7 @@ resource "aws_instance" "notebook" {
key_name = "${var.key_name}"
subnet_id = "${var.subnet_id}"
security_groups = ["${var.nb-sg_id}"]
- iam_instance_profile = "${var.iam_profile_name}"
+ iam_instance_profile = "${var.note_profile_name}"
tags = {
Name = "${local.node_name}"
"${var.project_tag}-Tag" = "${local.node_name}"
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 2e20934..def0910 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
@@ -20,14 +20,14 @@ data "template_file" "ssn_k8s_workers_user_data" {
resource "aws_launch_configuration" "ssn_k8s_launch_conf_masters" {
name = "${var.service_base_name}-ssn-launch-conf-masters"
- image_id = var.ami[var.env_os]
- instance_type = var.masters_shape
+ image_id = var.ami
+ instance_type = var.ssn_k8s_masters_shape
key_name = var.key_name
security_groups = [aws_security_group.ssn_k8s_sg.id]
iam_instance_profile = aws_iam_instance_profile.k8s-profile.name
root_block_device {
volume_type = "gp2"
- volume_size = var.root_volume_size
+ volume_size = var.ssn_root_volume_size
delete_on_termination = true
}
@@ -39,14 +39,14 @@ resource "aws_launch_configuration" "ssn_k8s_launch_conf_masters" {
resource "aws_launch_configuration" "ssn_k8s_launch_conf_workers" {
name = "${var.service_base_name}-ssn-launch-conf-workers"
- image_id = var.ami[var.env_os]
- instance_type = var.workers_shape
+ image_id = var.ami
+ instance_type = var.ssn_k8s_workers_shape
key_name = var.key_name
security_groups = [aws_security_group.ssn_k8s_sg.id]
iam_instance_profile = aws_iam_instance_profile.k8s-profile.name
root_block_device {
volume_type = "gp2"
- volume_size = var.root_volume_size
+ volume_size = var.ssn_root_volume_size
delete_on_termination = true
}
@@ -59,8 +59,8 @@ resource "aws_launch_configuration" "ssn_k8s_launch_conf_workers" {
resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_masters" {
name = "${var.service_base_name}-ssn-masters"
launch_configuration = aws_launch_configuration.ssn_k8s_launch_conf_masters.name
- min_size = var.masters_count
- max_size = var.masters_count
+ min_size = var.ssn_k8s_masters_count
+ max_size = var.ssn_k8s_masters_count
vpc_zone_identifier = [data.aws_subnet.k8s-subnet-data.id]
target_group_arns = [aws_lb_target_group.ssn_k8s_lb_target_group.arn]
@@ -79,8 +79,8 @@ resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_masters" {
resource "aws_autoscaling_group" "ssn_k8s_autoscaling_group_workers" {
name = "${var.service_base_name}-ssn-workers"
launch_configuration = aws_launch_configuration.ssn_k8s_launch_conf_workers.name
- min_size = var.workers_count
- max_size = var.workers_count
+ min_size = var.ssn_k8s_workers_count
+ max_size = var.ssn_k8s_workers_count
vpc_zone_identifier = [data.aws_subnet.k8s-subnet-data.id]
lifecycle {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org