Skip to content

Commit 11cb73a

Browse files
authored
Merge pull request #30 from remerge/CORE-363-support-configuration-of-default-scheduler-config-for-server-roles-in-ansible-nomad-role
CORE-363 Support specification of default_scheduler_config
2 parents 6bfea48 + 15b8fcf commit 11cb73a

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

defaults/main.yml

+5
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,8 @@ nomad_client_host_networks: []
3636
nomad_client_max_kill_timeout: 5m
3737
nomad_docker_auth_enabled: false
3838
nomad_docker_auth_file: /root/.docker/config.json
39+
40+
nomad_batch_scheduler_enabled: true
41+
nomad_scheduler_enabled: true
42+
nomad_service_scheduler_enabled: true
43+
nomad_sysbatch_scheduler_enabled: true

tasks/assert.yml

+28
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,34 @@
107107
- nomad_client is boolean
108108
quiet: true
109109

110+
- name: assert | Test if nomad_sysbatch_scheduler_enabled is set correctly
111+
ansible.builtin.assert:
112+
that:
113+
- nomad_sysbatch_scheduler_enabled is defined
114+
- nomad_sysbatch_scheduler_enabled is boolean
115+
quiet: true
116+
117+
- name: assert | Test if nomad_service_scheduler_enabled is set correctly
118+
ansible.builtin.assert:
119+
that:
120+
- nomad_service_scheduler_enabled is defined
121+
- nomad_service_scheduler_enabled is boolean
122+
quiet: true
123+
124+
- name: assert | Test if nomad_scheduler_enabled is set correctly
125+
ansible.builtin.assert:
126+
that:
127+
- nomad_scheduler_enabled is defined
128+
- nomad_scheduler_enabled is boolean
129+
quiet: true
130+
131+
- name: assert | Test if nomad_batch_scheduler_enabled is set correctly
132+
ansible.builtin.assert:
133+
that:
134+
- nomad_batch_scheduler_enabled is defined
135+
- nomad_batch_scheduler_enabled is boolean
136+
quiet: true
137+
110138
- name: assert | Test if nomad_client_node_class is set correctly
111139
ansible.builtin.assert:
112140
that:

templates/server.hcl.j2

+9
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,13 @@
33
server {
44
enabled = true
55
bootstrap_expect = {{ nomad_server_bootstrap_expect }}
6+
7+
default_scheduler_config {
8+
preemption_config {
9+
batch_scheduler_enabled = {{ nomad_batch_scheduler_enabled }}
10+
system_scheduler_enabled = {{ nomad_scheduler_enabled }}
11+
service_scheduler_enabled = {{ nomad_service_scheduler_enabled }}
12+
sysbatch_scheduler_enabled = {{ nomad_sysbatch_scheduler_enabled }}
13+
}
14+
}
615
}

0 commit comments

Comments
 (0)