fixes #44, server_yaml to have default content when graphite_host is not defined (#45)

* fixes #44, server_yaml to have default content when graphite_host is not defined

* Update CHANGELOG.md

Author: pradeepbhadani

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Changed
+- Set `server_yaml` to default content when `graphite_host` is not defined.
+
+
 ## [1.0.2] - 2019-01-07
 
 ### Changed

main.tf

@@ -75,8 +75,9 @@ resource "aws_cloudwatch_log_group" "waggledance_ecs" {
   tags = "${var.tags}"
 }
 
-data "template_file" "server_yaml" {
-  template = "${file("${path.module}/templates/waggle-dance-server.yml.tmpl")}"
+data "template_file" "graphite_server_yaml" {
+  count    = "${ var.graphite_host == "localhost" ? 0 : 1 }"
+  template = "${file("${path.module}/templates/waggle-dance-server-graphite.yml.tmpl")}"
 
   vars {
     graphite_host   = "${var.graphite_host}"
@@ -85,6 +86,14 @@ data "template_file" "server_yaml" {
   }
 }
 
+data "template_file" "server_yaml" {
+  template = "${file("${path.module}/templates/waggle-dance-server.yml.tmpl")}"
+
+  vars {
+    graphite = "${join("",data.template_file.graphite_server_yaml.*.rendered)}"
+  }
+}
+
 data "template_file" "primary_metastore_whitelist" {
   count = "${length(var.primary_metastore_whitelist)}"
 
@@ -131,7 +140,7 @@ data "template_file" "waggledance" {
     docker_version      = "${var.docker_version}"
     region              = "${var.aws_region}"
     loggroup            = "${aws_cloudwatch_log_group.waggledance_ecs.name}"
-    server_yaml         = "${ var.graphite_host == "localhost" ? "" : base64encode(data.template_file.server_yaml.rendered) }"
+    server_yaml         = "${base64encode(data.template_file.server_yaml.rendered)}"
     federation_yaml     = "${base64encode(data.template_file.federation_yaml.rendered)}"
     bastion_ssh_key_arn = "${var.bastion_ssh_key_secret_name == "" ? "" : join("",data.aws_secretsmanager_secret.bastion_ssh_key.*.arn)}"
   }

templates/waggle-dance-server-graphite.yml.tmpl

@@ -0,0 +1,6 @@
+graphite:
+  port: ${graphite_port}
+  host: ${graphite_host}
+  prefix: ${graphite_prefix}
+  poll-interval: 1000
+  poll-interval-time-unit: MILLISECONDS

templates/waggle-dance-server.yml.tmpl

@@ -1,8 +1,3 @@
 verbose: true
 database-resolution: PREFIXED
-graphite:
-  port: ${graphite_port}
-  host: ${graphite_host}
-  prefix: ${graphite_prefix}
-  poll-interval: 1000
-  poll-interval-time-unit: MILLISECONDS
+${graphite}