summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2019-01-22 15:50:21 +0200
committerBenjamin Copeland <ben.copeland@linaro.org>2019-01-23 10:28:50 +0000
commita7e95be3056432f06af4111047eac8aee0b476d7 (patch)
treedf26f4c31b4294f7e96e2fff340da574735967fe
parent81b805fa7d285b413e1cdc15ba32afb3228dacab (diff)
downloadansible-playbooks-master.tar.gz
jenkins-slaves: leg-aarch64 fixesHEADmaster
- Jenkins ip is different if connecting through vpn - Make sure systemd reloads config after systemd unit change Change-Id: Iaf0a3bec7b441e0e64ed2ecd1329157dcca1334b Signed-off-by: Riku Voipio <riku.voipio@linaro.org> Reviewed-on: https://review.linaro.org/29889 Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
-rw-r--r--group_vars/jenkins_slaves2
-rw-r--r--host_vars/leg-aarch64-011
-rw-r--r--roles/jenkins-slave-deps/tasks/main.yml3
3 files changed, 5 insertions, 1 deletions
diff --git a/group_vars/jenkins_slaves b/group_vars/jenkins_slaves
index eb4fb5c5..e6e4474f 100644
--- a/group_vars/jenkins_slaves
+++ b/group_vars/jenkins_slaves
@@ -27,3 +27,5 @@ docker_engine_opts:
ufw_open_ports:
- 22
+
+jenkins_ip: 88.99.136.175
diff --git a/host_vars/leg-aarch64-01 b/host_vars/leg-aarch64-01
new file mode 100644
index 00000000..e9435b5e
--- /dev/null
+++ b/host_vars/leg-aarch64-01
@@ -0,0 +1 @@
+jenkins_ip: 172.16.101.15
diff --git a/roles/jenkins-slave-deps/tasks/main.yml b/roles/jenkins-slave-deps/tasks/main.yml
index 29042571..3f9a30fc 100644
--- a/roles/jenkins-slave-deps/tasks/main.yml
+++ b/roles/jenkins-slave-deps/tasks/main.yml
@@ -13,7 +13,7 @@
port: "{{item.port}}"
src: "{{item.src}}"
with_items:
- - {port: 2375, src: '88.99.136.175'} #ci.linaro.org
+ - {port: 2375, src: '{{ jenkins_ip }}' } #ci.linaro.org
- {port: 16509, src: '172.17.0.0/24'}
- name: Open firewall port for Nexus
@@ -63,6 +63,7 @@
- "{{inventory_hostname}}-key.pem"
- "{{inventory_hostname}}-cert.pem"
notify:
+ - reload-systemd
- restart-docker
ignore_errors: '{{ ansible_check_mode }}'