From c811f54924e9524aeef449c5bd0025618dd91fc8 Mon Sep 17 00:00:00 2001 From: Andrew Edgar Date: Tue, 30 Jun 2020 14:03:48 -0600 Subject: [PATCH 1/2] Enable use of hostname from nats links --- jobs/route_emitter/templates/route_emitter.json.erb | 11 +++++++++-- .../templates/route_emitter.json.erb | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/jobs/route_emitter/templates/route_emitter.json.erb b/jobs/route_emitter/templates/route_emitter.json.erb index fba3371c0b..9992a5e920 100644 --- a/jobs/route_emitter/templates/route_emitter.json.erb +++ b/jobs/route_emitter/templates/route_emitter.json.erb @@ -4,8 +4,12 @@ nats_machines = nil if_p('diego.route_emitter.nats.machines') do |ips| nats_machines = ips.compact - end.else_if_link('nats') do - nats_machines = link('nats').instances.map { |instance| instance.address } + end.else do + link('nats').if_p("nats.hostname") do |hostname| + nats_machines = [hostname] + end.else do + nats_machines = link('nats').instances.map { |instance| instance.address } + end end nats_port = nil @@ -32,6 +36,9 @@ if_link('nats-tls') do |nats_link| if p("diego.route_emitter.nats.tls.enabled") nats_machines = nats_link.instances.map { |instance| instance.address } + nats_link.if_p("nats.hostname") do |hostname| + nats_machines = [hostname] + end if_p("diego.route_emitter.nats.tls.hostname") do | prop | nats_machines = [prop] end diff --git a/jobs/route_emitter_windows/templates/route_emitter.json.erb b/jobs/route_emitter_windows/templates/route_emitter.json.erb index a13382adae..2f4e0eca7c 100644 --- a/jobs/route_emitter_windows/templates/route_emitter.json.erb +++ b/jobs/route_emitter_windows/templates/route_emitter.json.erb @@ -4,8 +4,12 @@ nats_machines = nil if_p('diego.route_emitter.nats.machines') do |ips| nats_machines = ips.compact - end.else_if_link('nats') do - nats_machines = link('nats').instances.map { |instance| instance.address } + end.else do + link('nats').if_p("nats.hostname") do |hostname| + nats_machines = [hostname] + end.else do + nats_machines = link('nats').instances.map { |instance| instance.address } + end end nats_port = nil @@ -32,6 +36,9 @@ if_link('nats-tls') do |nats_link| if p("diego.route_emitter.nats.tls.enabled") nats_machines = nats_link.instances.map { |instance| instance.address } + nats_link.if_p("nats.hostname") do |hostname| + nats_machines = [hostname] + end if_p("diego.route_emitter.nats.tls.hostname") do | prop | nats_machines = [prop] end From 84d77de3c94bff47940adaeb4fcc70f58c75c263 Mon Sep 17 00:00:00 2001 From: Andrew Edgar Date: Fri, 10 Jul 2020 10:30:56 -0600 Subject: [PATCH 2/2] Fix to add the else_if_link for nats hostname --- jobs/route_emitter/templates/route_emitter.json.erb | 2 +- jobs/route_emitter_windows/templates/route_emitter.json.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/route_emitter/templates/route_emitter.json.erb b/jobs/route_emitter/templates/route_emitter.json.erb index 9992a5e920..0c4f0f6c96 100644 --- a/jobs/route_emitter/templates/route_emitter.json.erb +++ b/jobs/route_emitter/templates/route_emitter.json.erb @@ -4,7 +4,7 @@ nats_machines = nil if_p('diego.route_emitter.nats.machines') do |ips| nats_machines = ips.compact - end.else do + end.else_if_link('nats') do link('nats').if_p("nats.hostname") do |hostname| nats_machines = [hostname] end.else do diff --git a/jobs/route_emitter_windows/templates/route_emitter.json.erb b/jobs/route_emitter_windows/templates/route_emitter.json.erb index 2f4e0eca7c..0ee91e7419 100644 --- a/jobs/route_emitter_windows/templates/route_emitter.json.erb +++ b/jobs/route_emitter_windows/templates/route_emitter.json.erb @@ -4,7 +4,7 @@ nats_machines = nil if_p('diego.route_emitter.nats.machines') do |ips| nats_machines = ips.compact - end.else do + end.else_if_link('nats') do link('nats').if_p("nats.hostname") do |hostname| nats_machines = [hostname] end.else do