| commit | 2f8aa82dbee9a4200901ce0511d4e2892f9367af | [log] [tgz] |
|---|---|---|
| author | Ivan Berezovskiy <iberezovskiy@mirantis.com> | Wed Jan 09 14:01:21 2019 +0400 |
| committer | Ivan Berezovskiy <iberezovskiy@mirantis.com> | Wed Jan 09 13:30:43 2019 +0000 |
| tree | c71ae6f6210aba3f6ec766b4cfd2207555b3f4bd | |
| parent | c89f4d64409c60be499f75131085c933bbb4d108 [diff] |
Move ldap image to separate file as it's not always required Include classes with jenkins images into stack definition. Change-Id: I34c3033e88a030cacc476c2fc8337c9b78ef5558 Related-bug: #PROD-25515 (PROD:25515) (cherry picked from commit 555d42ff8bdce31cdccdbcb8bbf62871df75c5b6)
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: ""
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}