Update to 2022-08-01 12:00

This commit is contained in:
Daniel Berteaud
2022-08-01 12:00:18 +02:00
parent 75fd1e984a
commit 1650198b44
8 changed files with 84 additions and 72 deletions

View File

@@ -1,5 +1,5 @@
data_dir = "{{ nomad_root_dir }}/data"
log_level = "{{ nomad_log_level }}"
log_level = "{{ nomad_conf.log_level }}"
bind_addr = "0.0.0.0"
advertise {
@@ -16,12 +16,11 @@ ports {
{% endfor %}
}
{% if nomad_server.enabled %}
server {
enabled = true
bootstrap_expect = {{ nomad_server.bootstrap_expect }}
{% if nomad_server.encrypt is defined %}
encrypt = "{{ nomad_server.encrypt }}"
enabled = {{ nomad_conf.server.enabled | ternary('true', 'false') }}
bootstrap_expect = {{ nomad_conf.server.bootstrap_expect }}
{% if nomad_conf.server.encrypt is defined %}
encrypt = "{{ nomad_conf.server.encrypt }}"
{% endif %}
server_join {
retry_join = [
@@ -32,37 +31,33 @@ server {
}
}
{% if nomad_client.enabled %}
client {
enabled = true
enabled = {{ nomad_conf.client.enabled | ternary('true', 'false') }}
servers = [
{% for server in nomad_servers %}
"{{ server }}",
{% endfor %}
]
{% for volume in nomad_client.host_volumes %}
{% for volume in nomad_conf.client.host_volumes %}
host_volume "{{ volume.name }}" {
path = "{{ volume.path }}"
{% if volume.read_only is defined %}
read_only = "{{ volume.read_only | ternary('true', 'false') }}
read_only = "{{ volume.read_only | ternary('true', 'false') }}"
{% endif %}
}
{% endfor %}
}
{% endif %}
{% if nomad_ui.enabled %}
ui {
enabled = true
{% if nomad_ui.consul_ui is defined %}
enabled = {{ nomad_conf.ui.enabled | ternary('true', 'false') }}
{% if nomad_conf.ui.consul_ui is defined %}
consul {
ui_url = "{{ nomad_ui.consul_ui }}"
ui_url = "{{ nomad_conf.ui.consul_ui }}"
}
{% endif %}
{% if nomad_ui.vault_ui is defined %}
{% if nomad_conf.ui.vault_ui is defined %}
vault {
ui_url = "{{ nomad_ui.vault_ui }}"
ui_url = "{{ nomad_conf.ui.vault_ui }}"
}
{% endif %}
}
{% endif %}