|
|
@@ -152,12 +152,13 @@ public class PackerJob implements Callable<List<PackerImage>> { |
|
|
|
} |
|
|
|
ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(imagesToCreate)); |
|
|
|
} |
|
|
|
} else { |
|
|
|
// create list of all regions, without leading/trailing double-quote, which should already be in the template |
|
|
|
addAllRegions(computeDriver, ctx); |
|
|
|
} |
|
|
|
} else { |
|
|
|
// create list of all regions, without leading/trailing double-quote, which should already be in the template |
|
|
|
ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(computeDriver.getRegions().stream() |
|
|
|
.map(CloudRegion::getInternalName) |
|
|
|
.collect(Collectors.toList()))); |
|
|
|
addAllRegions(computeDriver, ctx); |
|
|
|
} |
|
|
|
|
|
|
|
final String imageName = PACKER_IMAGE_NAME_TEMPLATE |
|
|
@@ -219,6 +220,12 @@ public class PackerJob implements Callable<List<PackerImage>> { |
|
|
|
return images; |
|
|
|
} |
|
|
|
|
|
|
|
public void addAllRegions(ComputeServiceDriver computeDriver, Map<String, Object> ctx) { |
|
|
|
ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(computeDriver.getRegions().stream() |
|
|
|
.map(CloudRegion::getInternalName) |
|
|
|
.collect(Collectors.toList()))); |
|
|
|
} |
|
|
|
|
|
|
|
private String toInnerStringList(List<String> list) { |
|
|
|
if (empty(list)) return die("toInnerStringList: empty list"); |
|
|
|
final StringBuilder b = new StringBuilder(); |
|
|
|