diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json index a15ba84..ee693b4 100644 --- a/CloudFormation/artifactory-enterprise.json +++ b/CloudFormation/artifactory-enterprise.json @@ -14,7 +14,7 @@ }, "ExtraJavaOptions":{ - "Description": "Setting Java Memory Parameters for Artifactory", + "Description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware.", "Default" : "-server -Xms2g -Xmx14g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\\\\\"kill -9 %p\\\\\\\"", "Type" : "String" }, diff --git a/Terraform/main.tf b/Terraform/main.tf index 4bf0eb4..b00b66e 100644 --- a/Terraform/main.tf +++ b/Terraform/main.tf @@ -354,7 +354,7 @@ resource "aws_launch_configuration" "master" { associate_public_ip_address = true - user_data = "${template_file.init.rendered}" + user_data = "${data.template_file.init.rendered}" root_block_device { volume_type = "gp2" @@ -367,7 +367,7 @@ resource "aws_launch_configuration" "master" { } } -resource "template_file" "init" { +data "template_file" "init" { template = "${file("userdata.sh")}" vars = { @@ -406,7 +406,7 @@ resource "aws_launch_configuration" "secondary" { associate_public_ip_address = true - user_data = "${template_file.secondary_init.rendered}" + user_data = "${data.template_file.secondary_init.rendered}" root_block_device { volume_type = "gp2" @@ -419,7 +419,7 @@ resource "aws_launch_configuration" "secondary" { } } -resource "template_file" "secondary_init" { +data "template_file" "secondary_init" { template = "${file("userdata_secondary.sh")}" vars = { diff --git a/Terraform/variables.tf b/Terraform/variables.tf index 852705f..5ccd263 100644 --- a/Terraform/variables.tf +++ b/Terraform/variables.tf @@ -47,7 +47,7 @@ variable "artifactory_instance_type" { variable "extra_java_options" { default = "-server -Xms2g -Xmx14g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\\\\\"kill -9 %p\\\\\\\"" - description = "Setting Java Memory Parameters for Artifactory" + description = "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware." } variable "bucket_name" {