Skip to content

Commit 7730200

Browse files
committed
Split the analyst
This is needed because of the replication password, alternative would be to do the same split as for online and not have so many groups in groups but that also makes that we duplicate a lot of settings.
1 parent 65a0969 commit 7730200

File tree

6 files changed

+53
-52
lines changed

6 files changed

+53
-52
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
group_vars/onprem/analyst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Server VLAN IP prefix.
2+
SERVER_IP_PREFIX: 172.29.1
3+
4+
# URL and IP of domserver from judgehosts. A hostname 'domserver' with
5+
# DOMSERVER_IP will be added to the judgehost /etc/hosts file.
6+
DOMSERVER_IP: "{{SERVER_IP_PREFIX}}.240"
7+
8+
WF_GREEN: true
9+
10+
# Static IP address configuration. Uses the ansible_host variable as the static
11+
# IP address. Only configured if STATIC_IP_ENABLED is true.
12+
STATIC_IP_ENABLED: false
13+
STATIC_IP_NETMASK: 255.255.252.0
14+
STATIC_IP_GATEWAY: 172.29.0.1
15+
STATIC_IP_INTERFACE: enp1s0
16+
17+
# Additional entries for the /etc/hosts file.
18+
HOSTS:
19+
cds: 172.29.1.207
20+
packages: 172.29.1.209
21+
ntp1: 172.29.1.208
22+
ntp2: 172.29.1.209
23+
nisprint: 172.29.1.211
24+
nismaster: 172.29.1.211
25+
printsrv: 172.29.1.211
26+
27+
GRAFANA_MONITORING: false
28+
29+
# Password for the MySQL replication user.
30+
# Set this to enable master-master replication between two domservers.
31+
#REPLICATION_PASSWORD: {some-strong-replication-password}
32+
33+
# Database user password.
34+
DB_PASSWORD: {some-strong-database-password}
35+
36+
# Credentials for the judgehost.
37+
JUDGEHOST_PASSWORD: {some-strong-judgehost-password}

provision-contest/ansible/group_vars/onprem/secret.yml.example

-47
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
# Adding `strong` in the template will create longer passwords and is used for the
55
# passwords which almost never need to be manually typed.
66

7-
# Password for the MySQL replication user.
8-
# Set this to enable master-master replication between two domservers.
9-
#REPLICATION_PASSWORD: {some-strong-replication-password}
10-
117
# Database user password.
128
DB_PASSWORD: {some-strong-database-password}
139

@@ -24,48 +20,5 @@ ADMIN_PASSWORD: {some-admin-password}
2420
# created on the domserver and judgehosts.
2521
#DJ_SHELL_USER_PW: {some-hashed-password}
2622

27-
# Accounts to create when setting up the CDS
28-
CDS_ACCOUNTS:
29-
- username: admin
30-
password: {some-adm1n-password}
31-
type: admin
32-
- username: presAdmin
33-
password: {some-presentation-adm1n-password}
34-
type: admin
35-
- username: presentation
36-
password: {some-public-presentation-password}
37-
type: public
38-
#- username: blue
39-
# password: blu3
40-
# type: staff
41-
#- username: balloon
42-
# password: balloonPr1nter
43-
# type: balloon
44-
#- username: public
45-
# password: publ1c
46-
# type: public
47-
#- username: myicpc
48-
# password: my1cpc
49-
# type: spectator
50-
#- username: live
51-
# password: l1ve
52-
# type: analyst
53-
#- username: team1
54-
# password: t3am
55-
# type: team
56-
# team_id: 1
57-
58-
# Contest(s) to configure in the CDS
59-
CDS_CONTESTS:
60-
- path: nwerc18 # Path in the contest directory
61-
ccs:
62-
id: nwerc18 # ID of the contest if hosted at DOMJUDGE_URL
63-
# Or provide a absolute URL
64-
# url: https://www.domjudge.org/demoweb/api/contests/nwerc18
65-
username: admin
66-
password: admin
67-
68-
PRESCLIENT_CONTEST: nwerc18
69-
7023
# Sentry DSN URL
7124
# SENTRY_DSN:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
group_vars/onprem/wfinal
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Password for the MySQL replication user.
2+
# Set this to enable master-master replication between two domservers.
3+
REPLICATION_PASSWORD: {some-strong-replication-password}

provision-contest/ansible/hosts

+11-5
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@ admin
1515
online-domserver
1616
online-judgehost
1717

18-
[domserver]
18+
[domserver:children]
19+
wfinal-domserver
20+
analyst-domserver
21+
22+
[wfinal-domserver]
1923
# Set EFI_ORDER onsite for faster boot
2024
#EFI_ORDER='0\,1\,3\,4'
2125
domjudge-primary ansible_host=10.3.3.216 KEEPALIVED_PRIORITY=100
2226
domjudge-backup ansible_host=10.3.3.217 KEEPALIVED_PRIORITY=99
23-
# Discuss if we can have this host dualhomed in blue to make management easier.\
24-
# Looking at the IP sheet that would mean that our emergency laptop needs to move.
25-
domjudge-analyst ansible_host=172.29.1.240
2627

27-
[domserver:children]
28+
[wfinal-domserver:children]
2829
emergency
2930

3031
[emergency]
@@ -62,6 +63,11 @@ domjudge-ccsadmin5 ansible_host=10.3.3.227
6263
# Doesn't matter which (admin) machine but should not be 1 as that runs ansible
6364
domjudge-ccsadmin2 ansible_host=10.3.3.225
6465

66+
[analyst-domserver]
67+
# Discuss if we can have this host dualhomed in blue to make management easier.\
68+
# Looking at the IP sheet that would mean that our emergency laptop needs to move.
69+
domjudge-analyst ansible_host=172.29.1.240
70+
6571
[online-domserver]
6672
online-domserver ansible_host=192.168.255.255
6773

0 commit comments

Comments
 (0)