diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls --- a/pillar/paas/docker.sls +++ b/pillar/paas/docker.sls @@ -101,15 +101,16 @@ jenkins: jenkins_cd: host: cd.nasqueron.org + network: cd app_port: 38080 jnlp_port: 50000 jenkins_slave: # Slaves for CD apsile: - ip: 172.17.0.100 + network: cd elapsi: - ip: 172.17.0.101 + network: cd # Infrastructure and development services diff --git a/roles/paas-docker/containers/jenkins.sls b/roles/paas-docker/containers/jenkins.sls --- a/roles/paas-docker/containers/jenkins.sls +++ b/roles/paas-docker/containers/jenkins.sls @@ -42,6 +42,8 @@ - interactive: True - image: jenkinsci/jenkins - binds: /srv/{{ instance }}/jenkins_home:/var/jenkins_home + - networks: + - {{ container['network'] }} - ports: - 8080 - 50000 diff --git a/roles/paas-docker/containers/jenkins_slave.sls b/roles/paas-docker/containers/jenkins_slave.sls --- a/roles/paas-docker/containers/jenkins_slave.sls +++ b/roles/paas-docker/containers/jenkins_slave.sls @@ -52,4 +52,6 @@ - interactive: True - image: nasqueron/jenkins-slave-php - binds: /srv/jenkins/slave_home:/home/app + - networks: + - {{ container['network'] }} {% endfor %}