Browse files

Merge branch '0.14' of github.com:saltstack/salt into 0.14

  • Loading branch information...
2 parents f1830e5 + 84f4173 commit 7d54c2f6084290f777bc57f4eb51a0cc973a229d @thatch45 thatch45 committed Apr 13, 2013
Showing with 12 additions and 2 deletions.
  1. +1 −1 salt/version.py
  2. +11 −1 tests/minionswarm.py
View
2 salt/version.py
@@ -6,7 +6,7 @@
import sys
-__version_info__ = (0, 14, 0)
+__version_info__ = (0, 14, 1)
__version__ = '.'.join(map(str, __version_info__))
GIT_DESCRIBE_REGEX = (
View
12 tests/minionswarm.py
@@ -36,6 +36,13 @@ def parse():
dest='master',
default='salt',
help='The location of the salt master that this swarm will serve')
+ parser.add_option('--name',
+ '-n',
+ dest='name',
+ default='ms-',
+ help=('Give the minions an alternative id prefix, this is used '
+ 'when minons from many systems are being aggregated onto '
+ 'a single master'))
parser.add_option('-k',
'--keep-modules',
dest='keep',
@@ -109,7 +116,10 @@ def mkconf(self, idx):
'''
Create a config file for a single minion
'''
- minion_id = 'ms-{0}'.format(str(idx).zfill(self.__zfill))
+ minion_id = '{0}-{1}'.format(
+ self.opts['name'],
+ str(idx).zfill(self.__zfill)
+ )
dpath = os.path.join(self.swarm_root, minion_id)
os.makedirs(dpath)

0 comments on commit 7d54c2f

Please sign in to comment.