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:37:35 UTC
[incubator-dlab] branch DLAB-terraform-k8s updated: formatted code
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform-k8s
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform-k8s by this push:
new 17ce09b formatted code
17ce09b is described below
commit 17ce09bc88085029f854fcdc53de0cded3b9b099
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Jul 2 14:37:25 2019 +0300
formatted code
---
.../terraform/aws/main/main.tf | 36 ++++++-------
.../terraform/aws/main/variables.tf | 62 +++++++++-------------
.../terraform/aws/modules/ssn-k8s/variables.tf | 10 ++--
3 files changed, 48 insertions(+), 60 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/main/main.tf b/infrastructure-provisioning/terraform/aws/main/main.tf
index b6000b0..2d5b73d 100644
--- a/infrastructure-provisioning/terraform/aws/main/main.tf
+++ b/infrastructure-provisioning/terraform/aws/main/main.tf
@@ -5,24 +5,24 @@ provider "aws" {
}
module "ssn-k8s" {
- source = "../modules/ssn-k8s"
- service_base_name = var.service_base_name
- vpc_id = var.vpc_id
- vpc_cidr = var.vpc_cidr
- subnet_id = var.subnet_id
- env_os = var.env_os
- ami = var.ami
- key_name = var.key_name
- region = var.region
- zone = var.zone
- masters_count = var.masters_count
- workers_count = var.workers_count
- root_volume_size = var.root_volume_size
- allowed_cidrs = var.allowed_cidrs
- subnet_cidr = var.subnet_cidr
- masters_shape = var.masters_shape
- workers_shape = var.workers_shape
- os-user = var.os-user
+ source = "../modules/ssn-k8s"
+ service_base_name = var.service_base_name
+ vpc_id = var.vpc_id
+ vpc_cidr = var.vpc_cidr
+ subnet_id = var.subnet_id
+ env_os = var.env_os
+ ami = var.ami
+ key_name = var.key_name
+ region = var.region
+ zone = var.zone
+ ssn_k8s_masters_count = var.ssn_k8s_masters_count
+ ssn_k8s_workers_count = var.ssn_k8s_workers_count
+ ssn_root_volume_size = var.ssn_root_volume_size
+ allowed_cidrs = var.allowed_cidrs
+ subnet_cidr = var.subnet_cidr
+ ssn_k8s_masters_shape = var.ssn_k8s_masters_shape
+ ssn_k8s_workers_shape = var.ssn_k8s_workers_shape
+ os-user = var.os-user
}
module "common" {
diff --git a/infrastructure-provisioning/terraform/aws/main/variables.tf b/infrastructure-provisioning/terraform/aws/main/variables.tf
index cc417f7..4490a53 100644
--- a/infrastructure-provisioning/terraform/aws/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/main/variables.tf
@@ -1,39 +1,47 @@
+// AWS info
variable "access_key_id" {}
-
variable "secret_access_key" {}
-
variable "region" {
default = "us-west-2"
}
-
variable "zone" {
default = "a"
}
+// Common
+variable "env_os" {
+ default = "debian"
+}
+variable "key_name" {
+ default = "BDCC-DSS-POC"
+}
+variable "allowed_cidrs" {
+ default = ["0.0.0.0/0"]
+}
+variable "os-user" {
+ default = "dlab-user"
+}
+
+variable "project_tag" {
+ default = ""
+}
+
+// SSN
variable "service_base_name" {
default = "k8s"
}
-
variable "vpc_id" {
default = ""
}
-
variable "vpc_cidr" {
default = "172.31.0.0/16"
}
-
variable "subnet_id" {
default = ""
}
-
variable "subnet_cidr" {
default = "172.31.0.0/24"
}
-
-variable "env_os" {
- default = "debian"
-}
-
variable "ami" {
type = "map"
default = {
@@ -41,43 +49,23 @@ variable "ami" {
"redhat" = ""
}
}
-
-variable "key_name" {
- default = "BDCC-DSS-POC"
-}
-
-variable "masters_count" {
+variable "ssn_k8s_masters_count" {
default = 3
}
-
-variable "workers_count" {
+variable "ssn_k8s_workers_count" {
default = 2
}
-
-variable "root_volume_size" {
+variable "ssn_root_volume_size" {
default = 30
}
-
-variable "allowed_cidrs" {
- default = ["0.0.0.0/0"]
-}
-
-variable "masters_shape" {
+variable "ssn_k8s_masters_shape" {
default = "t2.medium"
}
-variable "workers_shape" {
+variable "ssn_k8s_workers_shape" {
default = "t2.medium"
}
-variable "os-user" {
- default = "dlab-user"
-}
-
-variable "project_tag" {
- default = ""
-}
-
variable "endpoint_tag" {}
variable "user_tag" {}
diff --git a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
index ac20f77..f4ad7d8 100644
--- a/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/modules/ssn-k8s/variables.tf
@@ -18,16 +18,16 @@ variable "region" {}
variable "zone" {}
-variable "masters_count" {}
+variable "ssn_k8s_masters_count" {}
-variable "workers_count" {}
+variable "ssn_k8s_workers_count" {}
-variable "root_volume_size" {}
+variable "ssn_root_volume_size" {}
variable "allowed_cidrs" {}
-variable "masters_shape" {}
+variable "ssn_k8s_masters_shape" {}
-variable "workers_shape" {}
+variable "ssn_k8s_workers_shape" {}
variable "os-user" {}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org