From ebb8181567cbb25ae059f7efa30c61be067dbd9d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 15 Apr 2022 20:55:46 +0200 Subject: salt-minion: T4364: migrate to get_config_dict() --- data/templates/salt-minion/minion.j2 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'data/templates/salt-minion/minion.j2') diff --git a/data/templates/salt-minion/minion.j2 b/data/templates/salt-minion/minion.j2 index cc1a63a6e..7e7ac5885 100644 --- a/data/templates/salt-minion/minion.j2 +++ b/data/templates/salt-minion/minion.j2 @@ -32,17 +32,17 @@ log_file: /var/log/salt/minion # ['garbage', 'trace', 'debug'] # # Default: 'warning' -log_level: {{ log_level }} +log_level: warning # Set the location of the salt master server, if the master server cannot be # resolved, then the minion will fail to start. master: {% for host in master %} -- {{ host }} + - {{ host }} {% endfor %} # The user to run salt -user: {{ user }} +user: minion # The directory to store the pki information in pki_dir: /config/salt/pki/minion @@ -52,9 +52,10 @@ pki_dir: /config/salt/pki/minion # Since salt uses detached ids it is possible to run multiple minions on the # same machine but with different ids, this can be useful for salt compute # clusters. -id: {{ salt_id }} +id: {{ id }} # The number of minutes between mine updates. mine_interval: {{ interval }} -verify_master_pubkey_sign: {{ verify_master_pubkey_sign }} +verify_master_pubkey_sign: {{ 'True' if master_key is vyos_defined else 'False' }} + -- cgit v1.2.3