Pull availability zone information from BOSH job spec.

Falls back to reading zone property from deployment manifest.

[#121080065]

Signed-off-by: nino khodabandeh <ninok@hpe.com>

Author: caleb miles

jobs/doppler/templates/doppler.json.erb

@@ -1,4 +1,18 @@
-<% require 'json' %>
+<% 
+
+    # try and set these properties from a BOSH 2.0 spec object
+    job_name = spec.job
+    instance_zone = spec.az
+    if job_name.nil?
+      job_name = name
+    end
+
+
+    if instance_zone.nil?
+      instance_zone = p("doppler.zone")
+    end
+
+%>
 {
   "EtcdUrls": [<%= p("loggregator.etcd.machines").map{|addr| "\"http://#{addr}:4001\""}.join(",") %>],
   "EtcdMaxConcurrentRequests": 10,
@@ -15,9 +29,9 @@
   },
   <% end %>
   "OutgoingPort": <%= p("doppler.outgoing_port") %>,
-  "Zone": "<%= p("doppler.zone") %>",
-  "JobName": "<%= name %>",
   "Index": <%= spec.index %>,
+  "Zone": "<%= instance_zone %>",
+  "JobName": "<%= job_name %>",
   "MaxRetainedLogMessages": <%= p("doppler.maxRetainedLogMessages") %>,
   "SharedSecret": "<%= p("doppler_endpoint.shared_secret") %>",
   "ContainerMetricTTLSeconds": <%= p("doppler.container_metric_ttl_seconds") %>,

jobs/metron_agent/templates/metron_agent.json.erb

@@ -5,12 +5,23 @@
     end
 
     useTLS = protocols.include? "tls"
+
+
+    # try and set these properties from a BOSH 2.0 spec object
+    job_name = spec.job
+    instance_zone = spec.az
+    if job_name.nil?
+      job_name = name
+    end
+    if instance_zone.nil?
+      instance_zone = p("metron_agent.zone")
+    end
 %>
 
 {
   "Index": <%= spec.index %>,
-  "Job": "<%= name %>",
-  "Zone": "<%= p("metron_agent.zone") %>",
+  "Job": "<%= job_name %>",
+  "Zone": "<%= instance_zone %>",
   "Deployment": "<%= p("metron_agent.deployment") %>",
 
   "EtcdUrls": [<%= p("loggregator.etcd.machines").map{|addr| "\"http://#{addr}:4001\""}.join(",")%>],