commit c314d5a3af310a7cfe198619be3f5aa15c0b25a5
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Oct 12 12:32:57 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Thu Oct 12 12:32:57 2017 +0000
tree 002feb19914e66ef3ac9c219db999d2e1de959e5
parent 0912c39a29e5b05760e76620dc91a05d9d4be829
parent 248e34e6ef9047535716521df804947dbfdc94f4

Merge "define Sl services for DevopsPortal"

docker/swarm/network/runbook.yml

diff --git a/docker/swarm/network/runbook.yml b/docker/swarm/network/runbook.yml
deleted file mode 100644
index 557b852..0000000
--- a/docker/swarm/network/runbook.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
-  _param:
-    docker_runbook_subnet: 10.40.0.0/24
-  docker:
-    client:
-      network:
-        runbook:
-          subnet: ${_param:docker_runbook_subnet}
-          driver: overlay
-          attachable: true

docker/swarm/stack/jenkins/master.yml

diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 5f8de05..e974dee 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -2,7 +2,7 @@
 - system.docker
 parameters:
   _param:
-    docker_image_jenkins: tcpcloud/jenkins:2.73
+    docker_image_jenkins: tcpcloud/jenkins:2.83
     jenkins_master_extra_opts: ""
     jenkins_master_executors_num: 4
     jenkins_master_max_concurent_requests: 40