From b304530a09508327b41d1f9944751db9df017233 Mon Sep 17 00:00:00 2001 From: brucec Date: Thu, 21 Mar 2019 12:58:45 -0700 Subject: [PATCH] First commit for callhome integration on terraform --- Terraform/main.tf | 4 +++- Terraform/userdata.sh | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Terraform/main.tf b/Terraform/main.tf index b00b66e..da5b573 100644 --- a/Terraform/main.tf +++ b/Terraform/main.tf @@ -391,6 +391,7 @@ data "template_file" "init" { certificate_domain = "${var.certificate_domain}" artifactory_server_name = "${var.artifactory_server_name}" EXTRA_JAVA_OPTS = "${var.extra_java_options}" + ISPRIMARY = "true" } } @@ -420,7 +421,7 @@ resource "aws_launch_configuration" "secondary" { } data "template_file" "secondary_init" { - template = "${file("userdata_secondary.sh")}" + template = "${file("userdata.sh")}" vars = { s3_bucket_name = "${aws_s3_bucket.b.id}" @@ -443,5 +444,6 @@ data "template_file" "secondary_init" { certificate_domain = "${var.certificate_domain}" artifactory_server_name = "${var.artifactory_server_name}" EXTRA_JAVA_OPTS = "${var.extra_java_options}" + ISPRIMARY = "false" } } \ No newline at end of file diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index a0040c2..ed13dcb 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -84,7 +84,7 @@ cat </var/opt/jfrog/artifactory/etc/ha-node.properties context.url=http://127.0.0.1:8081/artifactory membership.port=10001 hazelcast.interface=172.25.0.3 - primary=true + primary=${ISPRIMARY} EOF cat </etc/pki/tls/certs/result.pem @@ -172,6 +172,12 @@ server { } EOF +cat < /var/opt/jfrog/artifactory/etc/info/installer-info.json +{ + "productId": "JFrogMysqlTerraformInstaller/1.0.0" +} +EOF + cat /etc/pki/tls/certs/result.pem | sed 's/CERTIFICATE----- /CERTIFICATE-----\n/g' | sed 's/-----END/\n-----END/' > temp.pem mv -f temp.pem /etc/pki/tls/certs/cert.pem cat /etc/pki/tls/private/result.key | sed 's/KEY----- /KEY-----\n/g' | sed 's/-----END/\n-----END/' > temp.key @@ -181,6 +187,6 @@ echo "export JAVA_OPTIONS=\"${EXTRA_JAVA_OPTS}\"" >> /var/opt/jfrog/artifactory/ sed -i -e "s/art1/art-$(date +%s$RANDOM)/" /var/opt/jfrog/artifactory/etc/ha-node.properties sed -i -e "s/127.0.0.1/$(curl http://169.254.169.254/latest/meta-data/public-ipv4)/" /var/opt/jfrog/artifactory/etc/ha-node.properties sed -i -e "s/172.25.0.3/$(curl http://169.254.169.254/latest/meta-data/local-ipv4)/" /var/opt/jfrog/artifactory/etc/ha-node.properties -chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/security +chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/security service artifactory start service nginx start \ No newline at end of file