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

Fix and quote the compound matcher

Browse source
This commit is contained in:
Pedro Algarvio 2014-04-15 12:28:01 +01:00
parent af42254974
commit aad0e33af8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/jenkins.py
View file

@ -72,12 +72,12 @@ def build_pillar_data(options):
def build_minion_target(options, vm_name):
if options.grain_target is None:
return vm_name
return '-C L@{0} and G:{1}'.format(
vm_name,
' and G@'.join(options.grain_target)
)
target = vm_name
for grain in options.grain_target:
target += ' and G@{0}'.format(grain)
if options.grain_target is not None:
return '-C "{0}"'.format(target)
return target
def generate_vm_name(platform):