Merge "Add jenkins job ConfigHistory plugin"
diff --git a/elasticsearch/client/single.yml b/elasticsearch/client/single.yml
index c4e2b43..41a3b57 100644
--- a/elasticsearch/client/single.yml
+++ b/elasticsearch/client/single.yml
@@ -1,9 +1,12 @@
classes:
- service.elasticsearch.client
parameters:
+ _param:
+ elasticsearch_client_host: ${_param:stacklight_log_address}
+ elasticsearch_client_port: 9200
elasticsearch:
client:
enabled: true
server:
- host: ${_param:stacklight_log_address}
- port: ${_param:haproxy_elasticsearch_http_bind_port}
+ host: ${_param:elasticsearch_client_host}
+ port: ${_param:elasticsearch_client_port}
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index b6bab31..b6ed029 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -38,6 +38,10 @@
branch: "master"
tags: "5.6 latest"
dockerfile: "5.6/Dockerfile"
+ - name: jnlp-slave
+ branch: "master"
+ tags: "latest"
+ dockerfile: "Dockerfile"
template:
discard:
build: