Page MenuHomeDevCentral
Files F7692234

D1727.id4393.diff
No OneTemporary
Actions

D1727.id4393.diff
View Options

diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -100,17 +100,17 @@
jenkins:
jenkins_cd:
+ realm: cd
host: cd.nasqueron.org
- network: cd
app_port: 38080
jnlp_port: 50000
jenkins_slave:
# Slaves for CD
apsile:
- network: cd
+ realm: cd
elapsi:
- network: cd
+ realm: cd
# Infrastructure and development services
@@ -164,6 +164,15 @@
app_port: 9090
host: xmpp.nasqueron.org
+# -------------------------------------------------------------
+# Jenkins realms
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+jenkins_realms:
+ cd:
+ ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiWLxPzS8X6NraVwsK95gFGe1pIuz+K0n7aw81nabcf jenkins-master-equatower-cd
+ network: cd
+
# -------------------------------------------------------------
# Ports listened by XMPP
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/paas-docker/containers/files/jenkins_slave/authorized_keys b/roles/paas-docker/containers/files/jenkins_slave/authorized_keys
deleted file mode 100644
--- a/roles/paas-docker/containers/files/jenkins_slave/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiWLxPzS8X6NraVwsK95gFGe1pIuz+K0n7aw81nabcf jenkins-master-equatower-cd
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
@@ -11,11 +11,14 @@
{% for instance, container in containers['jenkins'].items() %}
+{% set realm = pillar['jenkins_realms'][container['realm']] %}
+{% set home = "/srv/jenkins/" + container['realm'] + "/jenkins_home" %}
+
# -------------------------------------------------------------
# Home directory
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/srv/{{ instance }}/jenkins_home:
+{{ home }}:
file.directory:
- user: 1000
- group: 1000
@@ -24,12 +27,12 @@
{% if has_selinux %}
selinux_context_jenkins_home:
selinux.fcontext_policy_present:
- - name: /srv/{{ instance }}/jenkins_home
+ - name: {{ home }}
- sel_type: svirt_sandbox_file_t
selinux_context_jenkins_home_applied:
selinux.fcontext_policy_applied:
- - name: /srv/{{ instance }}/jenkins_home
+ - name: {{ home }}
{% endif %}
# -------------------------------------------------------------
@@ -41,9 +44,9 @@
- detach: True
- interactive: True
- image: jenkinsci/jenkins
- - binds: /srv/{{ instance }}/jenkins_home:/var/jenkins_home
+ - binds: {{ home }}:/var/jenkins_home
- networks:
- - {{ container['network'] }}
+ - {{ realm['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
@@ -9,11 +9,16 @@
{% set has_selinux = salt['grains.get']('selinux:enabled', False) %}
{% set containers = pillar['docker_containers'][grains['id']] %}
+{% for instance, container in containers['jenkins_slave'].items() %}
+
+{% set realm = pillar['jenkins_realms'][container['realm']] %}
+{% set home = "/srv/jenkins/" + container['realm'] + "/slaves_homes/" + instance %}
+
# -------------------------------------------------------------
# Home directory
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/srv/jenkins/slave_home:
+{{ home }}:
file.directory:
- user: 431
- group: 433
@@ -22,22 +27,22 @@
{% if has_selinux %}
selinux_context_jenkins_slave_home:
selinux.fcontext_policy_present:
- - name: /srv/jenkins/slave_home
+ - name: {{ home }}
- sel_type: svirt_sandbox_file_t
selinux_context_jenkins_slave_home_applied:
selinux.fcontext_policy_applied:
- - name: /srv/jenkins/slave_home
+ - name: {{ home }}
{% endif %}
-/srv/jenkins/slave_home/.ssh:
+{{ home }}/.ssh:
file.directory:
- user: 431
- group: 433
-/srv/jenkins/slave_home/.ssh/authorized_keys:
+{{ home }}/.ssh/authorized_keys:
file.managed:
- - source: salt://roles/paas-docker/containers/files/jenkins_slave/authorized_keys
+ - contents: {{ container['ssh_key'] }}
- user: 431
- group: 433
@@ -45,13 +50,13 @@
# Container
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{% for instance, container in containers['jenkins_slave'].items() %}
{{ instance }}:
docker_container.running:
- detach: True
- interactive: True
- image: nasqueron/jenkins-slave-php
- - binds: /srv/jenkins/slave_home:/home/app
+ - binds: {{ home }}:/home/app
- networks:
- - {{ container['network'] }}
+ - {{ realm['network'] }}
+
{% endfor %}

File Metadata

Mime Type
text/plain
Expires
Fri, May 2, 04:30 (18 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2623469
Default Alt Text
D1727.id4393.diff (4 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator