commit 2f73410fa1048b74fe858b697efab1cd753c38a1
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Tue Feb 12 14:10:03 2019 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Thu May 23 15:40:55 2019 +0000
tree 2f6f797e8a11e706a3dbfa51dd26362af66fdbcd
parent e5129f6cb96e4860b715d701881fd0ba6713cfc4

Connect jenkins slave via docker network on swarm

Update jenkins location url for that case only

Change-Id: Icc74e24a4a4343ba32ca3bd7e2c15e9ea0e5ca6c
Related-bug: PROD-26834
             PROD-30275
(cherry picked from commit 883d27ba078a56333bffa80b5f903a8596546c8a)

docker/swarm/stack/jenkins/slave03.yml

diff --git a/docker/swarm/stack/jenkins/slave03.yml b/docker/swarm/stack/jenkins/slave03.yml
index f03ed24..cc2acbd 100644
--- a/docker/swarm/stack/jenkins/slave03.yml
+++ b/docker/swarm/stack/jenkins/slave03.yml
@@ -1,5 +1,4 @@
 classes:
-- system.docker
 - system.docker.swarm.stack.jenkins.slave_base
 parameters:
   _param:
@@ -14,12 +13,12 @@
                 JENKINS_URL: ${_param:jenkins_master_url}
                 JENKINS_AGENT_NAME: slave03
                 JENKINS_UPDATE_SLAVE: 'true'
-                JENKINS_LOGIN: ${_param:jenkins_slave_user}
-                JENKINS_PASSWORD: ${_param:jenkins_slave_password}
-                JAVA_OPTS: ${_param:jenkins_slave_extra_opts}
+                JENKINS_LOGIN: ${_param:jenkins_client_user}
+                JENKINS_PASSWORD: ${_param:jenkins_client_password}
+                JAVA_OPTS: "-Dhttp.proxyHost=${_param:docker_http_proxy} -Dhttp.nonProxyHosts=|jenkins_master ${_param:jenkins_slave_extra_opts}"
                 https_proxy: ${_param:docker_https_proxy}
                 http_proxy: ${_param:docker_http_proxy}
-                no_proxy: ${_param:docker_no_proxy}
+                no_proxy: "jenkins_master,${_param:docker_no_proxy}"
               deploy:
                 restart_policy:
                   condition: any