commit 52477821323c30fc9fa671b62b9e3f3a46c5c2e3
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Dec 25 12:25:43 2018 +0000
committer Gerrit Code Review <mail@domain.com> Tue Dec 25 12:25:43 2018 +0000
tree c9997c34f3b5ccea2f4f25a3511d21aeed2e8000
parent 1ca6cdb28e88ccf6d7ef4a9a4512a14807e626e1
parent 4ae6a28c6d4484f2a108512e7628cd9282f79d0e

Merge "Add data for state to pull docker images"

docker/client/images/jenkins_master.yml

diff --git a/docker/client/images/jenkins_master.yml b/docker/client/images/jenkins_master.yml
new file mode 100644
index 0000000..929c76e
--- /dev/null
+++ b/docker/client/images/jenkins_master.yml
@@ -0,0 +1,6 @@
+parameters:
+  docker:
+    client:
+      enabled: true
+      images:
+      - ${_param:docker_image_jenkins}
\ No newline at end of file

docker/client/images/jenkins_slave.yml

diff --git a/docker/client/images/jenkins_slave.yml b/docker/client/images/jenkins_slave.yml
new file mode 100644
index 0000000..46114d4
--- /dev/null
+++ b/docker/client/images/jenkins_slave.yml
@@ -0,0 +1,6 @@
+parameters:
+  docker:
+    client:
+      enabled: true
+      images:
+      - ${_param:docker_image_jenkins_slave}

docker/swarm/stack/jenkins/master.yml

diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 384ee9f..6af8d3e 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,5 +1,6 @@
 classes:
 - system.docker
+- system.docker.client.images.jenkins_master
 parameters:
   _param:
     jenkins_master_extra_opts: ""

docker/swarm/stack/jenkins/slave_base.yml

diff --git a/docker/swarm/stack/jenkins/slave_base.yml b/docker/swarm/stack/jenkins/slave_base.yml
index 630dd14..648a572 100644
--- a/docker/swarm/stack/jenkins/slave_base.yml
+++ b/docker/swarm/stack/jenkins/slave_base.yml
@@ -1,3 +1,5 @@
+classes:
+- system.docker.client.images.jenkins_slave
 parameters:
   _param:
     jenkins_master_host: ${_param:control_vip_address}