Skip to content

Commit dde3be4

Browse files
Use the ansible variable to write all cluster SSH clusters.
1 parent fdf3c42 commit dde3be4

File tree

3 files changed

+8
-37
lines changed

3 files changed

+8
-37
lines changed

provision-contest/ansible/hosts.example

-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ domjudge-analyst ansible_host=172.29.1.240
3939
[online-domserver]
4040
domjudge-aws ansible_host=0.0.0.0
4141

42-
[emergency:children]
43-
wf46-emergency
44-
wf47-emergency
45-
4642
[judgehost:children]
4743
wf46-judgehost
4844
wf47-judgehost

provision-contest/ansible/roles/clusterssh/tasks/main.yml

+3-33
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,10 @@
77
pkg:
88
- clusterssh
99

10-
- name: Create clusterssh 'all' config group
10+
- name: Create clusterssh clusters file
1111
become: true
1212
become_user: domjudge
13-
lineinfile:
13+
template:
14+
src: clusters.j2
1415
dest: /home/domjudge/.clusterssh/clusters
15-
regexp: '^all '
16-
line: "all {{ groups['all'] | join(' ') }}"
17-
create: true
18-
mode: 0644
19-
20-
- name: Create clusterssh config groups
21-
become: true
22-
become_user: domjudge
23-
lineinfile:
24-
dest: /home/domjudge/.clusterssh/clusters
25-
regexp: '^{{ item }}s '
26-
line: "{{ item }}s {{ groups[item] | join(' ') }}"
27-
create: true
28-
mode: 0644
29-
loop:
30-
- domserver
31-
- emergency
32-
- judgehost
33-
- admin
34-
- cds
35-
- grafana
36-
- scoreboard
37-
- mgmt
38-
39-
- name: Create clusterssh config groups
40-
become: true
41-
become_user: domjudge
42-
lineinfile:
43-
dest: /home/domjudge/.clusterssh/clusters
44-
regexp: '^all-domservers'
45-
line: "all-domservers {{ (groups['domserver'] + groups['emergency']) | join(' ') }}"
4616
mode: 0644
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{% for group in groups %}
2+
{% if groups[group] %}
3+
{{ group | replace('emergency', 'emergencie') }}{% if group != 'all' %}s{% endif %} {{ groups[group] | join(' ') }}
4+
{% endif %}
5+
{% endfor %}

0 commit comments

Comments
 (0)