Merge "additional description for Ceph upgrade job"
diff --git a/docker/swarm/stack/jenkins/jnlp_slave_multi.yml b/docker/swarm/stack/jenkins/jnlp_slave_multi.yml
index 5246cb7..3606bad 100644
--- a/docker/swarm/stack/jenkins/jnlp_slave_multi.yml
+++ b/docker/swarm/stack/jenkins/jnlp_slave_multi.yml
@@ -20,6 +20,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -29,6 +30,7 @@
image: ${_param:docker_image_jenkins_jnlp_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
@@ -44,6 +46,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -53,6 +56,7 @@
image: ${_param:docker_image_jenkins_jnlp_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
diff --git a/docker/swarm/stack/jenkins/jnlp_slave_single.yml b/docker/swarm/stack/jenkins/jnlp_slave_single.yml
index 8b05c47..956f918 100644
--- a/docker/swarm/stack/jenkins/jnlp_slave_single.yml
+++ b/docker/swarm/stack/jenkins/jnlp_slave_single.yml
@@ -24,6 +24,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -33,6 +34,7 @@
image: ${_param:docker_image_jenkins_jnlp_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 6ec6afb..9f3f0c2 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -23,6 +23,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: ${_param:docker_no_proxy}
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -33,3 +34,4 @@
volumes:
- /srv/volumes/jenkins:/var/jenkins_home
- /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
diff --git a/docker/swarm/stack/jenkins/ssh_slave_multi.yml b/docker/swarm/stack/jenkins/ssh_slave_multi.yml
index 2959e4d..5eafe44 100644
--- a/docker/swarm/stack/jenkins/ssh_slave_multi.yml
+++ b/docker/swarm/stack/jenkins/ssh_slave_multi.yml
@@ -15,6 +15,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -24,6 +25,7 @@
image: ${_param:docker_image_jenkins_ssh_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
@@ -34,6 +36,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -43,6 +46,7 @@
image: ${_param:docker_image_jenkins_ssh_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
diff --git a/docker/swarm/stack/jenkins/ssh_slave_single.yml b/docker/swarm/stack/jenkins/ssh_slave_single.yml
index dbdaf1d..f4e16a2 100644
--- a/docker/swarm/stack/jenkins/ssh_slave_single.yml
+++ b/docker/swarm/stack/jenkins/ssh_slave_single.yml
@@ -17,6 +17,7 @@
https_proxy: ${_param:docker_https_proxy}
http_proxy: ${_param:docker_http_proxy}
no_proxy: "jenkins_master,${_param:docker_no_proxy}"
+ GIT_SSL_CAINFO: /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem
deploy:
restart_policy:
condition: any
@@ -26,6 +27,7 @@
image: ${_param:docker_image_jenkins_ssh_slave}
volumes:
- /etc/ssl/certs/:/etc/ssl/certs/:ro
+ - /etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:/etc/ssl/certs/ca-${_param:salt_minion_ca_authority}.pem:ro
- /dev/urandom:/dev/random:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro