diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-27 19:38:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 19:38:53 +0200 |
| commit | 536fd31f868a19ccbea72a637cb6b984fa368ce9 (patch) | |
| tree | 67f2740ee48df38c8dacbcebdd901af129f4f8a8 /src/conf_mode/salt-minion.py | |
| parent | 9bdc3dca0d1b2cec3422b08c186af80ac2aa665e (diff) | |
| parent | 2bf12b579e083a8b527d3202ced365b8adf32625 (diff) | |
| download | vyos-1x-536fd31f868a19ccbea72a637cb6b984fa368ce9.tar.gz vyos-1x-536fd31f868a19ccbea72a637cb6b984fa368ce9.zip | |
Merge pull request #381 from thomas-mangin/T2388
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']: |