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

Backport #14674 to 2014.7

Browse source
This commit is contained in:
Colton Myers 2014-08-01 10:52:12 -06:00
commit 114d9a3489
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/modules/seed.py
View file

@ -129,9 +129,10 @@ def apply_(path, id_=None, config=None, approve_key=True, install=True,
'{0}'.format(mpt))
res = _install(mpt)
elif prep_install:
_prep_bootstrap(mpt)
log.info('{0} is ready for salt-minion installation'.format(mpt))
res = True
log.error('The prep_install option is no longer supported. Please use '
'the bootstrap script installed with Salt, located at {0}.'
.format(salt.syspaths.BOOTSTRAP))
res = False
else:
log.warn('No useful action performed on '
'{0}'.format(mpt))