Merge pull request #23230 from cachedout/swarm_tcp

Fix bug preventing minionswarm from working with tcp transport
This commit is contained in:
Mike Place 2015-04-30 12:49:45 -06:00
commit 92d7fcfff3

View File

@ -263,6 +263,8 @@ class MinionSwarm(Swarm):
data['raet_port'] = self.raet_port data['raet_port'] = self.raet_port
data['pki_dir'] = os.path.join(dpath, 'pki') data['pki_dir'] = os.path.join(dpath, 'pki')
self.raet_port += 1 self.raet_port += 1
elif self.opts['transport'] == 'tcp':
data['transport'] = 'tcp'
if self.opts['root_dir']: if self.opts['root_dir']:
data['root_dir'] = self.opts['root_dir'] data['root_dir'] = self.opts['root_dir']