saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30090 from techhat/seeddirs

Browse source 
Add argument to isdir()
This commit is contained in:
Mike Place 2015-12-30 15:41:01 -07:00
commit 3652dbae76
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/seed.py
View file

@ -145,9 +145,9 @@ def apply_(path, id_=None, config=None, approve_key=True, install=True,
'configuring as {0}'.format(id_))
minion_config = salt.config.minion_config(cfg_files['config'])
pki_dir = minion_config['pki_dir']
if not os.path.isdir():
if not os.path.isdir(os.path.join(mpt, pki_dir.lstrip('/'))):
__salt__['file.makedirs'](
os.path.join(mpt, pki_dir)
os.path.join(mpt, pki_dir.lstrip('/'))
)
os.rename(cfg_files['privkey'], os.path.join(
mpt, pki_dir.lstrip('/'), 'minion.pem'))