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 #26563 from rallytime/fix-20169

Browse source 
Fix error detection when salt-cloud config is missing a master's address
This commit is contained in:
Joseph Hall 2015-08-25 14:00:11 -06:00
commit 000e5a2acf
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/cloud/__init__.py
View file

@ -76,7 +76,8 @@ def enter_mainloop(target,
pool_size=None,
callback=None,
queue=None):
'''Manage a multiprocessing pool
'''
Manage a multiprocessing pool
- If the queue does not output anything, the pool runs indefinitely
@ -1172,12 +1173,11 @@ class Cloud(object):
)
if deploy:
if make_master is False and 'master' not in minion_dict:
raise SaltCloudConfigError(
(
'There\'s no master defined on the '
'{0!r} VM settings'
).format(vm_['name'])
if not make_master and 'master' not in minion_dict:
log.warn(
'There\'s no master defined on the {0!r} VM settings.'.format(
vm_['name']
)
)
if 'pub_key' not in vm_ and 'priv_key' not in vm_: