From 6499d6b33eac71f75eb0b502b486492fc4b49484 Mon Sep 17 00:00:00 2001 From: Yusuke Morimoto Date: Fri, 30 Oct 2020 00:32:37 +0900 Subject: [PATCH 1/5] Rename variables in docker-compose.yml in universal/scalardl module --- modules/universal/scalardl/main.tf | 6 +++--- modules/universal/scalardl/provision/docker-compose.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/universal/scalardl/main.tf b/modules/universal/scalardl/main.tf index 0c5134960..bf9487ea0 100644 --- a/modules/universal/scalardl/main.tf +++ b/modules/universal/scalardl/main.tf @@ -214,9 +214,9 @@ resource "null_resource" "scalardl_container" { inline = [ "cd $HOME/provision", "echo export SCALAR_IMAGE=${local.scalar_image} > env", - "echo export SCALAR_CASSANDRA_HOST=${local.scalar_cassandra_host} >> env", - "echo export SCALAR_CASSANDRA_USERNAME=${var.cassandra_username} >> env", - "echo export SCALAR_CASSANDRA_PASSWORD=${var.cassandra_password} >> env", + "echo export SCALAR_DB_CONTACT_POINTS=${local.scalar_cassandra_host} >> env", + "echo export SCALAR_DB_USERNAME=${var.cassandra_username} >> env", + "echo export SCALAR_DB_PASSWORD=${var.cassandra_password} >> env", "source ./env", "docker-compose up -d", ] diff --git a/modules/universal/scalardl/provision/docker-compose.yml b/modules/universal/scalardl/provision/docker-compose.yml index 5304f081d..da0ce68d9 100644 --- a/modules/universal/scalardl/provision/docker-compose.yml +++ b/modules/universal/scalardl/provision/docker-compose.yml @@ -4,9 +4,9 @@ services: scalar: image: ${SCALAR_IMAGE} environment: - - SCALAR_DB_CONTACT_POINTS=${SCALAR_CASSANDRA_HOST} - - SCALAR_DB_USERNAME=${SCALAR_CASSANDRA_USERNAME} - - SCALAR_DB_PASSWORD=${SCALAR_CASSANDRA_PASSWORD} + - SCALAR_DB_CONTACT_POINTS=${SCALAR_DB_CONTACT_POINTS} + - SCALAR_DB_USERNAME=${SCALAR_DB_USERNAME} + - SCALAR_DB_PASSWORD=${SCALAR_DB_PASSWORD} ports: - 50051:50051 # TODO: SCALAR_PORT - 50052:50052 # TODO: SCALAR_PRIVILEGED_PORT From a34e3b90cea0fee178be151d398807c3b8199ee2 Mon Sep 17 00:00:00 2001 From: Yusuke Morimoto Date: Sat, 31 Oct 2020 01:33:12 +0900 Subject: [PATCH 2/5] Rename variable names in universal/scalardl module --- modules/universal/scalardl/main.tf | 13 ++++++------- modules/universal/scalardl/vars.tf | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/universal/scalardl/main.tf b/modules/universal/scalardl/main.tf index bf9487ea0..c79c1afc2 100644 --- a/modules/universal/scalardl/main.tf +++ b/modules/universal/scalardl/main.tf @@ -1,7 +1,6 @@ locals { - scalar_image = "${var.scalardl_image_name}:${var.scalardl_image_tag}" - image_filename = "${basename(var.scalardl_image_name)}-${var.scalardl_image_tag}.tar.gz" - scalar_cassandra_host = "cassandra-lb.${var.internal_domain}" + scalar_image = "${var.scalardl_image_name}:${var.scalardl_image_tag}" + image_filename = "${basename(var.scalardl_image_name)}-${var.scalardl_image_tag}.tar.gz" schema_loader_image_filename = format("%s%s", replace(basename(var.schema_loader_image), ":", "-"), ".tar.gz") } @@ -190,7 +189,7 @@ resource "null_resource" "scalardl_schema" { provisioner "remote-exec" { inline = [ - "docker run --rm ${var.schema_loader_image} --cassandra -h ${local.scalar_cassandra_host} -u ${var.cassandra_username} -p ${var.cassandra_password} -n NetworkTopologyStrategy -R ${var.replication_factor}" + "docker run --rm ${var.schema_loader_image} --cassandra -h ${var.database_contact_points} -u ${var.database_username} -p ${var.database_password} -n NetworkTopologyStrategy -R ${var.cassandra_replication_factor}" ] } } @@ -214,9 +213,9 @@ resource "null_resource" "scalardl_container" { inline = [ "cd $HOME/provision", "echo export SCALAR_IMAGE=${local.scalar_image} > env", - "echo export SCALAR_DB_CONTACT_POINTS=${local.scalar_cassandra_host} >> env", - "echo export SCALAR_DB_USERNAME=${var.cassandra_username} >> env", - "echo export SCALAR_DB_PASSWORD=${var.cassandra_password} >> env", + "echo export SCALAR_DB_CONTACT_POINTS=${var.database_contact_points} >> env", + "echo export SCALAR_DB_USERNAME=${var.database_username} >> env", + "echo export SCALAR_DB_PASSWORD=${var.database_password} >> env", "source ./env", "docker-compose up -d", ] diff --git a/modules/universal/scalardl/vars.tf b/modules/universal/scalardl/vars.tf index 69c1ce77a..4e091ba4d 100644 --- a/modules/universal/scalardl/vars.tf +++ b/modules/universal/scalardl/vars.tf @@ -37,11 +37,6 @@ variable "scalardl_image_tag" { description = "The docker image tag for Scalar DL" } -variable "replication_factor" { - default = 3 - description = "Set the replication factor for schema" -} - variable "schema_loader_image" { default = "scalarlabs/scalardl-schema-loader:1.1.0" description = "The docker image for the schema loader" @@ -56,10 +51,19 @@ variable "internal_domain" { description = "Internal domain" } -variable "cassandra_username" { - description = "The username of cassandra cluster" +variable "database_contact_points" { + description = "The database contact points" +} + +variable "database_username" { + description = "The database username" +} + +variable "database_password" { + description = "The database password" } -variable "cassandra_password" { - description = "The password of cassandra cluster" +variable "cassandra_replication_factor" { + default = 3 + description = "The replication factor for the Cassandra schema" } From 0edf4d56f6b9f3a91940abfc55bf2856aec80867 Mon Sep 17 00:00:00 2001 From: Yusuke Morimoto Date: Sat, 31 Oct 2020 10:20:23 +0900 Subject: [PATCH 3/5] Rename variables related to Cassandra in scalardl modules --- examples/aws/scalardl/example.tfvars | 6 +++--- examples/azure/scalardl/example.tfvars | 6 +++--- modules/aws/scalardl/cluster/main.tf | 13 +++++++------ modules/aws/scalardl/cluster/vars.tf | 26 +++++++++++++------------- modules/aws/scalardl/locals.tf | 6 +++--- modules/aws/scalardl/scalardl.tf | 12 ++++++------ modules/azure/scalardl/cluster/main.tf | 13 +++++++------ modules/azure/scalardl/cluster/vars.tf | 18 +++++++++--------- modules/azure/scalardl/locals.tf | 7 +++---- modules/azure/scalardl/scalardl.tf | 12 ++++++------ 10 files changed, 60 insertions(+), 59 deletions(-) diff --git a/examples/aws/scalardl/example.tfvars b/examples/aws/scalardl/example.tfvars index ff82fbc3c..2617db8d6 100644 --- a/examples/aws/scalardl/example.tfvars +++ b/examples/aws/scalardl/example.tfvars @@ -11,12 +11,12 @@ scalardl = { # blue_discoverable_by_envoy = "true" # green_resource_count = "0" # green_image_tag = "2.0.7" - # replication_factor = "3" # green_image_name = "scalarlabs/scalar-ledger" # green_discoverable_by_envoy = "false" # enable_tdagent = "true" - # cassandra_username = "" - # cassandra_password = "" + # database_username = "cassandra" + # database_password = "cassandra" + # replication_factor = "3" } envoy = { diff --git a/examples/azure/scalardl/example.tfvars b/examples/azure/scalardl/example.tfvars index 0b04d1c6b..1f77cb16f 100644 --- a/examples/azure/scalardl/example.tfvars +++ b/examples/azure/scalardl/example.tfvars @@ -10,13 +10,13 @@ scalardl = { # blue_enable_accelerated_networking = "false" # green_resource_count = "0" # green_image_tag = "2.0.7" - # replication_factor = "3" # green_image_name = "scalarlabs/scalar-ledger" # green_discoverable_by_envoy = "false" # green_enable_accelerated_networking = "false" # enable_tdagent = "true" - # cassandra_username = "cassandra" - # cassandra_password = "cassandra" + # database_username = "cassandra" + # database_password = "cassandra" + # replication_factor = "3" } envoy = { diff --git a/modules/aws/scalardl/cluster/main.tf b/modules/aws/scalardl/cluster/main.tf index 68f0f8c6d..76ea2521b 100644 --- a/modules/aws/scalardl/cluster/main.tf +++ b/modules/aws/scalardl/cluster/main.tf @@ -53,10 +53,11 @@ module "scalardl_provision" { provision_count = var.resource_count enable_tdagent = var.enable_tdagent - scalardl_image_name = var.scalardl_image_name - scalardl_image_tag = var.scalardl_image_tag - replication_factor = var.replication_factor - internal_domain = var.internal_domain - cassandra_username = var.cassandra_username - cassandra_password = var.cassandra_password + scalardl_image_name = var.scalardl_image_name + scalardl_image_tag = var.scalardl_image_tag + internal_domain = var.internal_domain + database_contact_points = "cassandra-lb.${var.internal_domain}" # TODO: add to variables + database_username = var.database_username + database_password = var.database_password + replication_factor = var.replication_factor } diff --git a/modules/aws/scalardl/cluster/vars.tf b/modules/aws/scalardl/cluster/vars.tf index 4cffc736a..36ff589f2 100644 --- a/modules/aws/scalardl/cluster/vars.tf +++ b/modules/aws/scalardl/cluster/vars.tf @@ -64,11 +64,6 @@ variable "scalardl_image_tag" { description = "The docker image tag for Scalar DL" } -variable "replication_factor" { - default = 3 - description = "Set the replication factor for schema" -} - variable "enable_tdagent" { default = true description = "A flag to install td-agent that forwards logs to the monitor host" @@ -78,16 +73,21 @@ variable "internal_domain" { description = "Internal domain" } -variable "custom_tags" { - type = map(string) - default = {} - description = "The map of custom tags" +variable "database_username" { + description = "The database username" } -variable "cassandra_username" { - description = "The username of cassandra cluster" +variable "database_password" { + description = "The database password" } -variable "cassandra_password" { - description = "The password of cassandra cluster" +variable "replication_factor" { + default = 3 + description = "The replication factor for the Cassandra schema" +} + +variable "custom_tags" { + type = map(string) + default = {} + description = "The map of custom tags" } diff --git a/modules/aws/scalardl/locals.tf b/modules/aws/scalardl/locals.tf index 0629b632b..92495378b 100644 --- a/modules/aws/scalardl/locals.tf +++ b/modules/aws/scalardl/locals.tf @@ -30,7 +30,6 @@ locals { blue_discoverable_by_envoy = true green_resource_count = 0 green_image_tag = "2.0.7" - replication_factor = 3 green_image_name = "scalarlabs/scalar-ledger" green_discoverable_by_envoy = false target_port = 50051 @@ -38,8 +37,9 @@ locals { listen_port = 50051 privileged_listen_port = 50052 enable_tdagent = true - cassandra_username = "cassandra" - cassandra_password = "cassandra" + database_username = "cassandra" + database_password = "cassandra" + replication_factor = 3 } } diff --git a/modules/aws/scalardl/scalardl.tf b/modules/aws/scalardl/scalardl.tf index f17e0ef32..c90f7b7d2 100644 --- a/modules/aws/scalardl/scalardl.tf +++ b/modules/aws/scalardl/scalardl.tf @@ -17,12 +17,12 @@ module "scalardl_blue" { network_dns = local.network_dns scalardl_image_name = local.scalardl.blue_image_name scalardl_image_tag = local.scalardl.blue_image_tag - replication_factor = local.scalardl.replication_factor enable_tdagent = local.scalardl.enable_tdagent internal_domain = local.internal_domain + database_username = local.scalardl.database_username + database_password = local.scalardl.database_password + replication_factor = local.scalardl.replication_factor custom_tags = var.custom_tags - cassandra_username = local.scalardl.cassandra_username - cassandra_password = local.scalardl.cassandra_password } module "scalardl_green" { @@ -44,12 +44,12 @@ module "scalardl_green" { network_dns = local.network_dns scalardl_image_name = local.scalardl.green_image_name scalardl_image_tag = local.scalardl.green_image_tag - replication_factor = local.scalardl.replication_factor enable_tdagent = local.scalardl.enable_tdagent internal_domain = local.internal_domain + database_username = local.scalardl.database_username + database_password = local.scalardl.database_password + replication_factor = local.scalardl.replication_factor custom_tags = var.custom_tags - cassandra_username = local.scalardl.cassandra_username - cassandra_password = local.scalardl.cassandra_password } resource "aws_security_group" "scalardl" { diff --git a/modules/azure/scalardl/cluster/main.tf b/modules/azure/scalardl/cluster/main.tf index 80ac5515b..d617f7b2a 100644 --- a/modules/azure/scalardl/cluster/main.tf +++ b/modules/azure/scalardl/cluster/main.tf @@ -29,11 +29,12 @@ module "scalardl_provision" { private_key_path = var.private_key_path provision_count = var.resource_count enable_tdagent = var.enable_tdagent - internal_domain = var.internal_domain - scalardl_image_name = var.scalardl_image_name - scalardl_image_tag = var.scalardl_image_tag - replication_factor = var.replication_factor - cassandra_username = var.cassandra_username - cassandra_password = var.cassandra_password + scalardl_image_name = var.scalardl_image_name + scalardl_image_tag = var.scalardl_image_tag + internal_domain = var.internal_domain + database_contact_points = "cassandra-lb.${var.internal_domain}" # TODO: add to variables + database_username = var.database_username + database_password = var.database_password + replication_factor = var.replication_factor } diff --git a/modules/azure/scalardl/cluster/vars.tf b/modules/azure/scalardl/cluster/vars.tf index 3d42a54cd..635492bfd 100644 --- a/modules/azure/scalardl/cluster/vars.tf +++ b/modules/azure/scalardl/cluster/vars.tf @@ -68,11 +68,6 @@ variable "scalardl_image_tag" { description = "The docker image tag for Scalar DL" } -variable "replication_factor" { - default = 3 - description = "Set the replication factor for schema" -} - variable "availability_set_id" { default = "" } @@ -86,12 +81,17 @@ variable "internal_domain" { description = "Internal domain" } -variable "cassandra_username" { - description = "The username of cassandra cluster" +variable "database_username" { + description = "The database username" } -variable "cassandra_password" { - description = "The password of cassandra cluster" +variable "database_password" { + description = "The database password" +} + +variable "replication_factor" { + default = 3 + description = "The replication factor for the Cassandra schema" } variable "enable_accelerated_networking" { diff --git a/modules/azure/scalardl/locals.tf b/modules/azure/scalardl/locals.tf index a6aa5d4c9..204a88525 100644 --- a/modules/azure/scalardl/locals.tf +++ b/modules/azure/scalardl/locals.tf @@ -29,15 +29,14 @@ locals { blue_enable_accelerated_networking = false green_resource_count = 0 green_image_tag = "2.0.7" - replication_factor = 3 green_image_name = "scalarlabs/scalar-ledger" green_subnet_id = var.network.green_subnet_id green_discoverable_by_envoy = false green_enable_accelerated_networking = false enable_tdagent = true - cassandra_username = "cassandra" - cassandra_password = "cassandra" - + database_username = "cassandra" + database_password = "cassandra" + replication_factor = 3 } } diff --git a/modules/azure/scalardl/scalardl.tf b/modules/azure/scalardl/scalardl.tf index a040399e9..66182d5b3 100644 --- a/modules/azure/scalardl/scalardl.tf +++ b/modules/azure/scalardl/scalardl.tf @@ -25,12 +25,12 @@ module "scalardl_blue" { network_dns = local.network_dns scalardl_image_name = local.scalardl.blue_image_name scalardl_image_tag = local.scalardl.blue_image_tag - replication_factor = local.scalardl.replication_factor enable_tdagent = local.scalardl.enable_tdagent availability_set_id = azurerm_availability_set.scalar_availability_set.id internal_domain = local.internal_domain - cassandra_username = local.scalardl.cassandra_username - cassandra_password = local.scalardl.cassandra_password + database_username = local.scalardl.database_username + database_password = local.scalardl.database_password + replication_factor = local.scalardl.replication_factor enable_accelerated_networking = local.scalardl.blue_enable_accelerated_networking } @@ -55,12 +55,12 @@ module "scalardl_green" { network_dns = local.network_dns scalardl_image_name = local.scalardl.green_image_name scalardl_image_tag = local.scalardl.green_image_tag - replication_factor = local.scalardl.replication_factor enable_tdagent = local.scalardl.enable_tdagent availability_set_id = azurerm_availability_set.scalar_availability_set.id internal_domain = local.internal_domain - cassandra_username = local.scalardl.cassandra_username - cassandra_password = local.scalardl.cassandra_password + database_username = local.scalardl.database_username + database_password = local.scalardl.database_password + replication_factor = local.scalardl.replication_factor enable_accelerated_networking = local.scalardl.green_enable_accelerated_networking } From 63351b59c15b457fd2f4226903bc4b89b6402075 Mon Sep 17 00:00:00 2001 From: Yusuke Morimoto Date: Sat, 31 Oct 2020 23:53:14 +0900 Subject: [PATCH 4/5] Rename replication_factor to cassandra_replication_factor --- examples/aws/scalardl/example.tfvars | 28 ++++---- examples/azure/scalardl/example.tfvars | 2 +- modules/aws/monitor/locals.tf | 2 +- modules/aws/scalardl/cluster/main.tf | 14 ++-- modules/aws/scalardl/cluster/vars.tf | 2 +- modules/aws/scalardl/locals.tf | 36 +++++------ modules/aws/scalardl/output.tf | 2 +- modules/aws/scalardl/scalardl.tf | 88 +++++++++++++------------- modules/azure/monitor/locals.tf | 2 +- modules/azure/scalardl/cluster/main.tf | 14 ++-- modules/azure/scalardl/cluster/vars.tf | 2 +- modules/azure/scalardl/locals.tf | 2 +- modules/azure/scalardl/output.tf | 2 +- modules/azure/scalardl/scalardl.tf | 4 +- 14 files changed, 100 insertions(+), 100 deletions(-) diff --git a/examples/aws/scalardl/example.tfvars b/examples/aws/scalardl/example.tfvars index 2617db8d6..a2ffb3bbf 100644 --- a/examples/aws/scalardl/example.tfvars +++ b/examples/aws/scalardl/example.tfvars @@ -3,20 +3,20 @@ region = "ap-northeast-1" base = "default" # bai, chiku, sho scalardl = { - # resource_type = "t3.medium" - # resource_root_volume_size = "64" - # blue_resource_count = "3" - # blue_image_tag = "2.0.7" - # blue_image_name = "scalarlabs/scalar-ledger" - # blue_discoverable_by_envoy = "true" - # green_resource_count = "0" - # green_image_tag = "2.0.7" - # green_image_name = "scalarlabs/scalar-ledger" - # green_discoverable_by_envoy = "false" - # enable_tdagent = "true" - # database_username = "cassandra" - # database_password = "cassandra" - # replication_factor = "3" + # resource_type = "t3.medium" + # resource_root_volume_size = "64" + # blue_resource_count = "3" + # blue_image_tag = "2.0.7" + # blue_image_name = "scalarlabs/scalar-ledger" + # blue_discoverable_by_envoy = "true" + # green_resource_count = "0" + # green_image_tag = "2.0.7" + # green_image_name = "scalarlabs/scalar-ledger" + # green_discoverable_by_envoy = "false" + # enable_tdagent = "true" + # database_username = "cassandra" + # database_password = "cassandra" + # cassandra_replication_factor = "3" } envoy = { diff --git a/examples/azure/scalardl/example.tfvars b/examples/azure/scalardl/example.tfvars index 1f77cb16f..61036ab30 100644 --- a/examples/azure/scalardl/example.tfvars +++ b/examples/azure/scalardl/example.tfvars @@ -16,7 +16,7 @@ scalardl = { # enable_tdagent = "true" # database_username = "cassandra" # database_password = "cassandra" - # replication_factor = "3" + # cassandra_replication_factor = "3" } envoy = { diff --git a/modules/aws/monitor/locals.tf b/modules/aws/monitor/locals.tf index 74555daf7..c188fb311 100644 --- a/modules/aws/monitor/locals.tf +++ b/modules/aws/monitor/locals.tf @@ -18,7 +18,7 @@ locals { cassandra_resource_count = lookup(var.cassandra, "resource_count", 0) scalardl_blue_resource_count = lookup(var.scalardl, "blue_resource_count", 0) scalardl_green_resource_count = lookup(var.scalardl, "green_resource_count", 0) - scalardl_replication_factor = lookup(var.scalardl, "replication_factor", 0) + scalardl_replication_factor = lookup(var.scalardl, "cassandra_replication_factor", 0) } ### default diff --git a/modules/aws/scalardl/cluster/main.tf b/modules/aws/scalardl/cluster/main.tf index 76ea2521b..2c7a1a7b6 100644 --- a/modules/aws/scalardl/cluster/main.tf +++ b/modules/aws/scalardl/cluster/main.tf @@ -53,11 +53,11 @@ module "scalardl_provision" { provision_count = var.resource_count enable_tdagent = var.enable_tdagent - scalardl_image_name = var.scalardl_image_name - scalardl_image_tag = var.scalardl_image_tag - internal_domain = var.internal_domain - database_contact_points = "cassandra-lb.${var.internal_domain}" # TODO: add to variables - database_username = var.database_username - database_password = var.database_password - replication_factor = var.replication_factor + scalardl_image_name = var.scalardl_image_name + scalardl_image_tag = var.scalardl_image_tag + internal_domain = var.internal_domain + database_contact_points = "cassandra-lb.${var.internal_domain}" # TODO: add to variables + database_username = var.database_username + database_password = var.database_password + cassandra_replication_factor = var.cassandra_replication_factor } diff --git a/modules/aws/scalardl/cluster/vars.tf b/modules/aws/scalardl/cluster/vars.tf index 36ff589f2..b619b4b93 100644 --- a/modules/aws/scalardl/cluster/vars.tf +++ b/modules/aws/scalardl/cluster/vars.tf @@ -81,7 +81,7 @@ variable "database_password" { description = "The database password" } -variable "replication_factor" { +variable "cassandra_replication_factor" { default = 3 description = "The replication factor for the Cassandra schema" } diff --git a/modules/aws/scalardl/locals.tf b/modules/aws/scalardl/locals.tf index 92495378b..966f72d38 100644 --- a/modules/aws/scalardl/locals.tf +++ b/modules/aws/scalardl/locals.tf @@ -22,24 +22,24 @@ locals { ### default locals { scalardl_default = { - resource_type = "t3.medium" - resource_root_volume_size = 64 - blue_resource_count = 3 - blue_image_tag = "2.0.7" - blue_image_name = "scalarlabs/scalar-ledger" - blue_discoverable_by_envoy = true - green_resource_count = 0 - green_image_tag = "2.0.7" - green_image_name = "scalarlabs/scalar-ledger" - green_discoverable_by_envoy = false - target_port = 50051 - privileged_target_port = 50052 - listen_port = 50051 - privileged_listen_port = 50052 - enable_tdagent = true - database_username = "cassandra" - database_password = "cassandra" - replication_factor = 3 + resource_type = "t3.medium" + resource_root_volume_size = 64 + blue_resource_count = 3 + blue_image_tag = "2.0.7" + blue_image_name = "scalarlabs/scalar-ledger" + blue_discoverable_by_envoy = true + green_resource_count = 0 + green_image_tag = "2.0.7" + green_image_name = "scalarlabs/scalar-ledger" + green_discoverable_by_envoy = false + target_port = 50051 + privileged_target_port = 50052 + listen_port = 50051 + privileged_listen_port = 50052 + enable_tdagent = true + database_username = "cassandra" + database_password = "cassandra" + cassandra_replication_factor = 3 } } diff --git a/modules/aws/scalardl/output.tf b/modules/aws/scalardl/output.tf index da2ce2642..7b6146895 100644 --- a/modules/aws/scalardl/output.tf +++ b/modules/aws/scalardl/output.tf @@ -34,7 +34,7 @@ output "scalardl_green_resource_count" { } output "scalardl_replication_factor" { - value = local.scalardl.replication_factor + value = local.scalardl.cassandra_replication_factor description = "The replication factor for the schema of scalardl." } diff --git a/modules/aws/scalardl/scalardl.tf b/modules/aws/scalardl/scalardl.tf index c90f7b7d2..1c1e204d0 100644 --- a/modules/aws/scalardl/scalardl.tf +++ b/modules/aws/scalardl/scalardl.tf @@ -1,55 +1,55 @@ module "scalardl_blue" { source = "./cluster" - security_group_ids = aws_security_group.scalardl.*.id - bastion_ip = local.bastion_ip - network_name = local.network_name - resource_type = local.scalardl.resource_type - resource_count = local.scalardl.blue_resource_count - resource_cluster_name = "blue" - resource_root_volume_size = local.scalardl.resource_root_volume_size - triggers = local.triggers - private_key_path = local.private_key_path - user_name = local.user_name - subnet_ids = local.blue_subnet_ids - image_id = local.image_id - key_name = local.key_name - network_dns = local.network_dns - scalardl_image_name = local.scalardl.blue_image_name - scalardl_image_tag = local.scalardl.blue_image_tag - enable_tdagent = local.scalardl.enable_tdagent - internal_domain = local.internal_domain - database_username = local.scalardl.database_username - database_password = local.scalardl.database_password - replication_factor = local.scalardl.replication_factor - custom_tags = var.custom_tags + security_group_ids = aws_security_group.scalardl.*.id + bastion_ip = local.bastion_ip + network_name = local.network_name + resource_type = local.scalardl.resource_type + resource_count = local.scalardl.blue_resource_count + resource_cluster_name = "blue" + resource_root_volume_size = local.scalardl.resource_root_volume_size + triggers = local.triggers + private_key_path = local.private_key_path + user_name = local.user_name + subnet_ids = local.blue_subnet_ids + image_id = local.image_id + key_name = local.key_name + network_dns = local.network_dns + scalardl_image_name = local.scalardl.blue_image_name + scalardl_image_tag = local.scalardl.blue_image_tag + enable_tdagent = local.scalardl.enable_tdagent + internal_domain = local.internal_domain + database_username = local.scalardl.database_username + database_password = local.scalardl.database_password + cassandra_replication_factor = local.scalardl.cassandra_replication_factor + custom_tags = var.custom_tags } module "scalardl_green" { source = "./cluster" - security_group_ids = aws_security_group.scalardl.*.id - bastion_ip = local.bastion_ip - network_name = local.network_name - resource_type = local.scalardl.resource_type - resource_count = local.scalardl.green_resource_count - resource_cluster_name = "green" - resource_root_volume_size = local.scalardl.resource_root_volume_size - triggers = local.triggers - private_key_path = local.private_key_path - user_name = local.user_name - subnet_ids = local.green_subnet_ids - image_id = local.image_id - key_name = local.key_name - network_dns = local.network_dns - scalardl_image_name = local.scalardl.green_image_name - scalardl_image_tag = local.scalardl.green_image_tag - enable_tdagent = local.scalardl.enable_tdagent - internal_domain = local.internal_domain - database_username = local.scalardl.database_username - database_password = local.scalardl.database_password - replication_factor = local.scalardl.replication_factor - custom_tags = var.custom_tags + security_group_ids = aws_security_group.scalardl.*.id + bastion_ip = local.bastion_ip + network_name = local.network_name + resource_type = local.scalardl.resource_type + resource_count = local.scalardl.green_resource_count + resource_cluster_name = "green" + resource_root_volume_size = local.scalardl.resource_root_volume_size + triggers = local.triggers + private_key_path = local.private_key_path + user_name = local.user_name + subnet_ids = local.green_subnet_ids + image_id = local.image_id + key_name = local.key_name + network_dns = local.network_dns + scalardl_image_name = local.scalardl.green_image_name + scalardl_image_tag = local.scalardl.green_image_tag + enable_tdagent = local.scalardl.enable_tdagent + internal_domain = local.internal_domain + database_username = local.scalardl.database_username + database_password = local.scalardl.database_password + cassandra_replication_factor = local.scalardl.cassandra_replication_factor + custom_tags = var.custom_tags } resource "aws_security_group" "scalardl" { diff --git a/modules/azure/monitor/locals.tf b/modules/azure/monitor/locals.tf index 4e213b85c..0ab1ed676 100644 --- a/modules/azure/monitor/locals.tf +++ b/modules/azure/monitor/locals.tf @@ -18,7 +18,7 @@ locals { cassandra_resource_count = lookup(var.cassandra, "resource_count", 0) scalardl_blue_resource_count = lookup(var.scalardl, "blue_resource_count", 0) scalardl_green_resource_count = lookup(var.scalardl, "green_resource_count", 0) - scalardl_replication_factor = lookup(var.scalardl, "replication_factor", 0) + scalardl_replication_factor = lookup(var.scalardl, "cassandra_replication_factor", 0) } ### default diff --git a/modules/azure/scalardl/cluster/main.tf b/modules/azure/scalardl/cluster/main.tf index d617f7b2a..cf40efa8d 100644 --- a/modules/azure/scalardl/cluster/main.tf +++ b/modules/azure/scalardl/cluster/main.tf @@ -30,11 +30,11 @@ module "scalardl_provision" { provision_count = var.resource_count enable_tdagent = var.enable_tdagent - scalardl_image_name = var.scalardl_image_name - scalardl_image_tag = var.scalardl_image_tag - internal_domain = var.internal_domain - database_contact_points = "cassandra-lb.${var.internal_domain}" # TODO: add to variables - database_username = var.database_username - database_password = var.database_password - replication_factor = var.replication_factor + scalardl_image_name = var.scalardl_image_name + scalardl_image_tag = var.scalardl_image_tag + internal_domain = var.internal_domain + database_contact_points = "cassandra-lb.${var.internal_domain}" # TODO: add to variables + database_username = var.database_username + database_password = var.database_password + cassandra_replication_factor = var.cassandra_replication_factor } diff --git a/modules/azure/scalardl/cluster/vars.tf b/modules/azure/scalardl/cluster/vars.tf index 635492bfd..bc7da1aef 100644 --- a/modules/azure/scalardl/cluster/vars.tf +++ b/modules/azure/scalardl/cluster/vars.tf @@ -89,7 +89,7 @@ variable "database_password" { description = "The database password" } -variable "replication_factor" { +variable "cassandra_replication_factor" { default = 3 description = "The replication factor for the Cassandra schema" } diff --git a/modules/azure/scalardl/locals.tf b/modules/azure/scalardl/locals.tf index 204a88525..774dfa5e7 100644 --- a/modules/azure/scalardl/locals.tf +++ b/modules/azure/scalardl/locals.tf @@ -36,7 +36,7 @@ locals { enable_tdagent = true database_username = "cassandra" database_password = "cassandra" - replication_factor = 3 + cassandra_replication_factor = 3 } } diff --git a/modules/azure/scalardl/output.tf b/modules/azure/scalardl/output.tf index fd95c5625..bfb8d44f6 100644 --- a/modules/azure/scalardl/output.tf +++ b/modules/azure/scalardl/output.tf @@ -34,7 +34,7 @@ output "scalardl_green_resource_count" { } output "scalardl_replication_factor" { - value = local.scalardl.replication_factor + value = local.scalardl.cassandra_replication_factor description = "The replication factor for the schema of scalardl." } diff --git a/modules/azure/scalardl/scalardl.tf b/modules/azure/scalardl/scalardl.tf index 66182d5b3..b4fef5552 100644 --- a/modules/azure/scalardl/scalardl.tf +++ b/modules/azure/scalardl/scalardl.tf @@ -30,7 +30,7 @@ module "scalardl_blue" { internal_domain = local.internal_domain database_username = local.scalardl.database_username database_password = local.scalardl.database_password - replication_factor = local.scalardl.replication_factor + cassandra_replication_factor = local.scalardl.cassandra_replication_factor enable_accelerated_networking = local.scalardl.blue_enable_accelerated_networking } @@ -60,7 +60,7 @@ module "scalardl_green" { internal_domain = local.internal_domain database_username = local.scalardl.database_username database_password = local.scalardl.database_password - replication_factor = local.scalardl.replication_factor + cassandra_replication_factor = local.scalardl.cassandra_replication_factor enable_accelerated_networking = local.scalardl.green_enable_accelerated_networking } From e7e6e744cb4d8ef67ccc059f0b56b7d0de49cd9f Mon Sep 17 00:00:00 2001 From: Yusuke Morimoto Date: Fri, 6 Nov 2020 13:17:52 +0900 Subject: [PATCH 5/5] Update READMEs --- modules/aws/scalardl/cluster/README.md | 14 ++++++++++---- modules/azure/scalardl/cluster/README.md | 13 ++++++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/aws/scalardl/cluster/README.md b/modules/aws/scalardl/cluster/README.md index 41b05c871..c6cba3859 100644 --- a/modules/aws/scalardl/cluster/README.md +++ b/modules/aws/scalardl/cluster/README.md @@ -1,14 +1,21 @@ # Cluster Module of Scalar DL The Cluster module deploys a Scalar DL cluster. +## Requirements + +| Name | Version | +|------|---------| +| terraform | >= 0.12 | + ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|------|---------|:-----:| +|------|-------------|------|---------|:--------:| | bastion_ip | The IP to bastion host used for provisioning | `any` | n/a | yes | -| cassandra_password | The password of cassandra cluster | `any` | n/a | yes | -| cassandra_username | The username of cassandra cluster | `any` | n/a | yes | +| cassandra_replication_factor | The replication factor for the Cassandra schema | `number` | `3` | no | | custom_tags | The map of custom tags | `map(string)` | `{}` | no | +| database_password | The database password | `any` | n/a | yes | +| database_username | The database username | `any` | n/a | yes | | enable_tdagent | A flag to install td-agent that forwards logs to the monitor host | `bool` | `true` | no | | image_id | The image id to initiate | `any` | n/a | yes | | internal_domain | Internal domain | `any` | n/a | yes | @@ -16,7 +23,6 @@ The Cluster module deploys a Scalar DL cluster. | network_dns | The ID for the internal DNS zone | `any` | n/a | yes | | network_name | The name of the network resources: should be generated by provider/universal/name-generator | `any` | n/a | yes | | private_key_path | The path to the private key for SSH access | `any` | n/a | yes | -| replication_factor | Set the replication factor for schema | `number` | `3` | no | | resource_cluster_name | The name to assign the resource cluster | `any` | n/a | yes | | resource_count | The number of resources to create | `any` | n/a | yes | | resource_root_volume_size | The size of resource root volume size | `any` | n/a | yes | diff --git a/modules/azure/scalardl/cluster/README.md b/modules/azure/scalardl/cluster/README.md index 08484c7f9..6f51f8476 100644 --- a/modules/azure/scalardl/cluster/README.md +++ b/modules/azure/scalardl/cluster/README.md @@ -1,10 +1,11 @@ # Cluster Module of Scalar DL The Cluster module deploys a Scalar DL cluster on Azure. -## Providers +## Requirements | Name | Version | |------|---------| +| terraform | >= 0.12 | | azurerm | =1.38.0 | ## Inputs @@ -13,18 +14,19 @@ The Cluster module deploys a Scalar DL cluster on Azure. |------|-------------|------|---------|:--------:| | availability_set_id | n/a | `string` | `""` | no | | bastion_ip | The IP to bastion host used for provisioning | `any` | n/a | yes | -| cassandra_password | The password of cassandra cluster | `any` | n/a | yes | -| cassandra_username | The username of cassandra cluster | `any` | n/a | yes | +| cassandra_replication_factor | The replication factor for the Cassandra schema | `number` | `3` | no | +| database_password | The database password | `any` | n/a | yes | +| database_username | The database username | `any` | n/a | yes | | enable_accelerated_networking | A flag to enable accelerated networking on network interface | `bool` | `false` | no | | enable_tdagent | A flag to install td-agent that forwards logs to the monitor host | `bool` | `true` | no | | image_id | The image id to initiate | `any` | n/a | yes | | internal_domain | Internal domain | `any` | n/a | yes | -| region | The Azure region to deploy environment | `any` | n/a | yes | +| locations | The Azure availability zones to deploy environment | `list(string)` | n/a | yes | | network_dns | The ID for the internal DNS zone | `any` | n/a | yes | | network_name | The name of the network resources: should be generated by provider/universal/name-generator | `any` | n/a | yes | | private_key_path | The path to the private key for SSH access | `any` | n/a | yes | | public_key_path | The path to the public key for SSH access | `any` | n/a | yes | -| replication_factor | Set the replication factor for schema | `number` | `3` | no | +| region | The Azure region to deploy environment | `any` | n/a | yes | | resource_cluster_name | The name to assign the resource cluster | `any` | n/a | yes | | resource_count | The number of resources to create | `any` | n/a | yes | | resource_root_volume_size | The size of resource root volume size | `any` | n/a | yes | @@ -42,3 +44,4 @@ The Cluster module deploys a Scalar DL cluster on Azure. | network_interface_ids | A list of network interface IDs associated with the VM. | | network_interface_private_ip | A list of private IP addresses assigned to scalardl cluster instances. | | vm_ids | A list of VM IDs of a scalardl cluster. | +