Commit 34539130 authored by Antoine Millet's avatar Antoine Millet
Browse files

VMSpec wide target is now intersected with machine specific target

parent f5e6e6c5

cloudcontrol/common/allocation/vmspec.py

+5 −0
Original line number Diff line number Diff line
@@ -176,6 +176,11 @@ def expand_vmspec(vmspec): 
            if riskgroup not in riskgroups:

                raise VMSpecValidationError('machines/%s: riskgroup not defined')

            specs['riskgroup'] = riskgroups[riskgroup]

        if 'target' in vmspec:

            if 'target' in specs:

                specs['target'] = '(%s)&(%s)' % (vmspec['target'], specs['target'])

            else:

                specs['target'] = vmspec['target']

        vmspec_expanded.append(specs)

    return vmspec_expanded