-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from rackspace-infrastructure-automation/MPCSU…
…PENG-874 HCL2\Terraform v0.12 conversion
- Loading branch information
Showing
10 changed files
with
286 additions
and
255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 0.12.17 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| #################################################### | ||
| # Basic Internet accessible Elasticsearch endpoint # | ||
| #################################################### | ||
| terraform { | ||
| required_version = ">= 0.12" | ||
| } | ||
|
|
||
| provider "aws" { | ||
| region = "us-west-2" | ||
| version = "~> 2.2" | ||
| } | ||
|
|
||
| module "es_internet" { | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-elasticsearch//?ref=v0.0.7" | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-elasticsearch//?ref=v0.12.0" | ||
|
|
||
| name = "es-internet-endpoint" | ||
| ip_whitelist = ["1.2.3.4"] | ||
| name = "es-internet-endpoint" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,30 @@ | ||
| ############################################### | ||
| # Basic VPC accessible Elasticsearch endpoint # | ||
| ############################################### | ||
| terraform { | ||
| required_version = ">= 0.12" | ||
| } | ||
|
|
||
| provider "aws" { | ||
| region = "us-west-2" | ||
| version = "~> 2.2" | ||
| } | ||
|
|
||
| module "vpc" { | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-vpc_basenetwork//?ref=v0.0.9" | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-vpc_basenetwork//?ref=v0.12.0" | ||
|
|
||
| vpc_name = "Test1VPC" | ||
| name = "Test1VPC" | ||
| } | ||
|
|
||
| module "sg" { | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-security_group//?ref=v0.0.5" | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-security_group//?ref=v0.12.0" | ||
|
|
||
| resource_name = "Test-SG" | ||
| vpc_id = "${module.vpc.vpc_id}" | ||
| vpc_id = module.vpc.vpc_id | ||
| } | ||
|
|
||
| module "es_vpc" { | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-elasticsearch//?ref=v0.0.7" | ||
|
|
||
| name = "es-vpc-endpoint" | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-elasticsearch//?ref=v0.12.0" | ||
|
|
||
| name = "es-vpc-endpoint" | ||
| security_groups = [module.sg.public_web_security_group_id] | ||
| subnets = module.vpc.private_subnets | ||
| vpc_enabled = true | ||
| security_groups = ["${module.sg.public_web_security_group_id}"] | ||
| subnets = ["${module.vpc.private_subnets}"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,52 @@ | ||
| ######################################################### | ||
| # Customized Internet accessible Elasticsearch endpoint # | ||
| ######################################################### | ||
| terraform { | ||
| required_version = ">= 0.12" | ||
| } | ||
|
|
||
| provider "aws" { | ||
| region = "us-west-2" | ||
| version = "~> 2.2" | ||
| } | ||
|
|
||
| data "aws_kms_alias" "es_kms" { | ||
| name = "alias/aws/es" | ||
| } | ||
|
|
||
| module "internal_zone" { | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-route53_internal_zone//?ref=v.0.0.3" | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-route53_internal_zone//?ref=v0.12.0" | ||
|
|
||
| zone_name = "mycompany.local" | ||
| environment = "Development" | ||
| target_vpc_id = "${module.vpc.vpc_id}" | ||
| environment = "Development" | ||
| name = "mycompany.local" | ||
| vpc_id = module.vpc.vpc_id | ||
| } | ||
|
|
||
| module "es_all_options" { | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-elasticsearch//?ref=v0.0.7" | ||
|
|
||
| name = "es-custom" | ||
|
|
||
| ip_whitelist = ["1.2.3.4"] | ||
|
|
||
| elasticsearch_version = "7.1" | ||
| environment = "Production" | ||
| source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-elasticsearch//?ref=v0.12.0" | ||
|
|
||
| data_node_count = "8" | ||
| data_node_count = 8 | ||
| data_node_instance_type = "r4.large.elasticsearch" | ||
| master_node_count = "5" | ||
| ebs_iops = 1000 | ||
| ebs_size = 50 | ||
| ebs_type = "io1" | ||
| elasticsearch_version = "7.1" | ||
| encrypt_storage_enabled = true | ||
| encrypt_traffic_enabled = true | ||
| encryption_kms_key = data.aws_kms_alias.es_kms.target_key_arn | ||
| environment = "Production" | ||
| internal_record_name = "es-custom" | ||
| internal_zone_id = module.internal_zone.internal_hosted_name | ||
| internal_zone_name = module.internal_zone.internal_hosted_name | ||
| ip_whitelist = ["1.2.3.4"] | ||
| logging_application_logs = true | ||
| logging_index_slow_logs = true | ||
| logging_retention = 14 | ||
| logging_search_slow_logs = true | ||
| master_node_count = 5 | ||
| master_node_instance_type = "r4.large.elasticsearch" | ||
|
|
||
| encrypt_storage_enabled = true | ||
| encrypt_traffic_enabled = true | ||
| encryption_kms_key = "${data.aws_kms_alias.es_kms.target_key_arn}" | ||
|
|
||
| ebs_iops = "1000" | ||
| ebs_size = "50" | ||
| ebs_type = "io1" | ||
|
|
||
| internal_record_name = "es-custom" | ||
| internal_zone_id = "${module.internal_zone.internal_hosted_name}" | ||
| internal_zone_name = "${module.internal_zone.internal_hosted_name}" | ||
|
|
||
| logging_application_logs = true | ||
| logging_index_slow_logs = true | ||
| logging_retention = 14 | ||
| logging_search_slow_logs = true | ||
|
|
||
| snapshot_start_hour = 21 | ||
|
|
||
| vpc_enabled = true | ||
| subnets = ["subnet-0146733139bfe351b", "subnet-04362ec0a2a4b1382"] | ||
| security_groups = ["sg-0024aee5bbfbaddbc", "sg-018f1576271f11f3e"] | ||
| name = "es-custom" | ||
| security_groups = ["sg-0024aee5bbfbaddbc", "sg-018f1576271f11f3e"] | ||
| snapshot_start_hour = 21 | ||
| subnets = ["subnet-0146733139bfe351b", "subnet-04362ec0a2a4b1382"] | ||
| vpc_enabled = true | ||
|
|
||
| tags = { | ||
| Tag1 = "Value1" | ||
|
|
||
Oops, something went wrong.