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 #51361 from olipovch/cloud-sync-after-install

Browse source 
Fix salt-cloud sync_after_install functionality
This commit is contained in:
Megan Wilhite 2019-03-07 15:04:30 -05:00 • committed by GitHub
commit 17017a1c31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cloud/__init__.py
View file

@ -1288,16 +1288,16 @@ class Cloud(object):
start = int(time.time())
while int(time.time()) < start + 60:
# We'll try every <timeout> seconds, up to a minute
mopts_ = salt.config.DEFAULT_MINION_OPTS
mopts_ = salt.config.DEFAULT_MASTER_OPTS
conf_path = '/'.join(self.opts['conf_file'].split('/')[:-1])
mopts_.update(
salt.config.minion_config(
salt.config.master_config(
os.path.join(conf_path,
'minion')
'master')
)
)
client = salt.client.get_local_client(mopts=self.opts)
client = salt.client.get_local_client(mopts=mopts_)
ret = client.cmd(
vm_['name'],