diff options
| author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-27 11:46:51 +0100 |
|---|---|---|
| committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-27 11:51:53 +0100 |
| commit | 2bf12b579e083a8b527d3202ced365b8adf32625 (patch) | |
| tree | bce48dcc8aede9d3578c374f86a7932319de58e0 /src/conf_mode/salt-minion.py | |
| parent | cff252427c1aa9c8fe0cf7a305c2a5a294c71773 (diff) | |
| download | vyos-1x-2bf12b579e083a8b527d3202ced365b8adf32625.tar.gz vyos-1x-2bf12b579e083a8b527d3202ced365b8adf32625.zip | |
template: T2388: move mkdir/chmod/chown within render()
Diffstat (limited to 'src/conf_mode/salt-minion.py')
| -rwxr-xr-x | src/conf_mode/salt-minion.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py index dffe7fcd4..8bc35bb45 100755 --- a/src/conf_mode/salt-minion.py +++ b/src/conf_mode/salt-minion.py @@ -79,14 +79,8 @@ def generate(salt): if not salt: return None - for file in [config_file, master_keyfile]: - dirname = os.path.dirname(file) - if not os.path.exists(dirname): - os.mkdir(dirname) - chown(dirname, salt['user'], salt['group']) - - render(config_file, 'salt-minion/minion.tmpl', salt) - chown(config_file, salt['user'], salt['group']) + render(config_file, 'salt-minion/minion.tmpl', salt, + user=salt['user'], group=salt['group']) if not os.path.exists(master_keyfile): if salt['master_key']: |