Skip to content

Commit 42ef36f

Browse files
authored
Merge pull request #140 from cloud-gov/fix-platform-job-config
fix link name in platform job config
2 parents 08a5d7d + 9ee908c commit 42ef36f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

jobs/elasticsearch-platform/templates/config/config.yml.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ opendistro_security:
2727

2828
<%
2929
cluster_name = nil
30-
if_link("elasticsearch") { |elasticsearch_link| cluster_name = elasticsearch_link.p("elasticsearch.cluster_name") }
30+
if_link("elasticsearch-platform") { |elasticsearch_link| cluster_name = elasticsearch_link.p("elasticsearch.cluster_name") }
3131
unless cluster_name
3232
cluster_name = p("elasticsearch.cluster_name")
3333
end
3434
master_hosts = nil
35-
if_link("elasticsearch") { |elasticsearch_link| master_hosts = elasticsearch_link.instances.map {|e| e.address }.join(',') }
35+
if_link("elasticsearch-platform") { |elasticsearch_link| master_hosts = elasticsearch_link.instances.map {|e| e.address }.join(',') }
3636
unless master_hosts
3737
master_hosts = p("elasticsearch.master_hosts").join(',')
3838
end

jobs/kibana-platform/templates/bin/kibana

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export JOB_NAME=kibana-platform
99
export JOB_DIR=/var/vcap/jobs/$JOB_NAME
1010
<%
1111
elasticsearch_port = nil
12-
if_link("elasticsearch") { |elasticsearch_link| elasticsearch_port = elasticsearch_link.p("elasticsearch.port") }
12+
if_link("elasticsearch-platform") { |elasticsearch_link| elasticsearch_port = elasticsearch_link.p("elasticsearch.port") }
1313
unless elasticsearch_port
1414
elasticsearch_port = p("kibana.elasticsearch.port")
1515
end

jobs/kibana-platform/templates/config/kibana.conf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ server.host: <%= p('kibana.host') %>
1212
# elasticsearch.url: "http://localhost:9200"
1313
<%
1414
elasticsearch_port = nil
15-
if_link("elasticsearch") { |elasticsearch_link| elasticsearch_port = elasticsearch_link.p("elasticsearch.port") }
15+
if_link("elasticsearch-platform") { |elasticsearch_link| elasticsearch_port = elasticsearch_link.p("elasticsearch.port") }
1616
unless elasticsearch_port
1717
elasticsearch_port = p("kibana.elasticsearch.port")
1818
end

0 commit comments

Comments
 (0)