@@ -38,3 +38,3 @@
 else
   echo "Patching and restarting..."
-  ssh ${HOST} "cd /tmp && cp ~bubble/current/bubble.jar . && cd classes && jar uvf ../bubble.jar . | egrep -v '*/\(*' && cat ../bubble.jar > ~bubble/current/bubble.jar && supervisorctl restart bubble" || die "Error patching remote jar"
+  ssh ${HOST} "cd /tmp && cp ~bubble/api/bubble.jar . && cd classes && jar uvf ../bubble.jar . | egrep -v '*/\(*' && cat ../bubble.jar > ~bubble/api/bubble.jar && supervisorctl restart bubble" || die "Error patching remote jar"

@@ -55,3 +55,3 @@
 else
   echo "Patching and restarting..."
-  ssh ${HOST} "cat /tmp/bubble.jar > ~bubble/current/bubble.jar && supervisorctl restart bubble"
+  ssh ${HOST} "cat /tmp/bubble.jar > ~bubble/api/bubble.jar && supervisorctl restart bubble"

@@ -14,3 +14,3 @@
 # Environment variables
 #
-#   BUBBLE_ENV     : env file to load. Default is ~/.bubble.env or /home/bubble/current/bubble.env (whichever is found first)
+#   BUBBLE_ENV     : env file to load. Default is ~/.bubble.env or /home/bubble/api/bubble.env (whichever is found first)

@@ -13,3 +13,3 @@
 
 # Install packages
-sudo apt install openjdk-11-jdk maven postgresql-10 redis-server jq python3 python3-pip npm webpack curl -y || die "Error installing apt packages"
+sudo apt install openjdk-11-jdk maven postgresql-10 redis-server jq python3 python3-pip npm webpack curl unzip -y || die "Error installing apt packages"

@@ -0,0 +7,4 @@
+
+# Install packer
+if [[ ! -f ${HOME}/packer/packer ]] ; then
+  PACKER_VERSION=1.5.6

@@ -0,0 +17,4 @@
+
+# Install packer Vultr plugin
+if [[ ! -f ${HOME}/.packer.d/plugins/packer-builder-vultr ]] ; then
+  PACKER_VULTR_VERSION=1.0.8

@@ -117,3 +43,3 @@
-echo "Updated $(ls -1 ${ROLES_DIR} | wc -l) roles in ${DEFAULT_ROLES}"
+cd ${CLASSES_DIR} && jar uvf ${BUBBLE_JAR} scripts || die "Error updating ${BUBBLE_JAR} with scripts"
 
 rm -f "${UPDATED}"

@@ -0,0 +47,4 @@
+    public boolean isOptionalConfigName(String cfgName) {
+        final String[] names = getOptionalConfigNames();
+        if (names == null) return false;
+        return Arrays.asList(names).contains(cfgName);

@@ -59,0 +55,4 @@
+        for (CloudRegion configRegion : config.getRegions()) {
+            final CloudRegion cloudRegion = getCloudRegions().stream()
+                    .filter(s -> s.getInternalName().equalsIgnoreCase(configRegion.getInternalName()))
+                    .findFirst()

@@ -59,0 +63,4 @@
+                cloudRegions.add(configRegion.setId(cloudRegion.getId()));
+            }
+        }
+        return cloudRegions;

@@ -66,0 +70,4 @@
+    private List<ComputeNodeSize> initSizes() {
+        final ArrayList<ComputeNodeSize> cloudSizes = new ArrayList<>();
+        for (ComputeNodeSize configSize : config.getSizes()) {
+            final ComputeNodeSize cloudSize = getCloudSizes().stream().filter(sz -> sz.getInternalName().equals(configSize.getInternalName())).findFirst().orElse(null);

@@ -66,0 +74,4 @@
+            if (cloudSize == null) {
+                log.warn("initSizes: config region not found: "+configSize.getInternalName());
+            } else {
+                cloudSizes.add(cloudSize

@@ -69,0 +85,4 @@
+    @Getter(lazy=true) private final OsImage os = initOs();
+    private OsImage initOs() {
+        final OsImage os = getCloudOsImages().stream()
+                .filter(s -> s.getName().equals(config.getOs()))

@@ -172,2 +165,2 @@
-        final ComputeNodeSize size = config.getSize(node.getSize());
-        final String os = config.getConfig("os");
+        final CloudRegion region = getRegions().stream()
+                .filter(r -> r.getInternalName().equals(node.getRegion()))

@@ -260,1 +234,4 @@
 
+    @Override public List<PackerImage> getPackerImages() {
+        final List<PackerImage> images = getResources(PACKER_IMAGES_URI, new DigitalOceanPackerImageParser(configuration.getVersion(), packerService.getPackerPublicKeyHash(), configuration.getJarSha()));
+        return images == null ? Collections.emptyList() : images;

@@ -0,0 +20,4 @@
+        } else {
+            return die("parse: id not found");
+        }
+        if (item.has("name")) {

@@ -0,0 +62,4 @@
+
+    @Override protected List<OsImage> getCloudOsImages() {
+        // todo
+        return null;

@@ -0,0 +14,4 @@
+        if (!item.has("vcpu_count")) return die("parse: vcpu_count not found");
+        if (!item.has("ram")) return die("parse: ram not found");
+        if (!item.has("disk")) return die("parse: disk not found");
+        return new ComputeNodeSize()

@@ -0,0 +20,4 @@
+                .setVcpu(item.get("vcpu_count").asInt())
+                .setMemoryMB(item.get("ram").asInt())
+                .setSsdGB(item.get("disk").asInt())
+                .setTransferGB(item.get("bandwidth_gb").asInt());

@@ -60,3 +66,1 @@
-    @Getter(lazy=true) private static final Map<String, Integer> regionMap = getResourceMap(REGIONS_URL);
-    @Getter(lazy=true) private static final Map<String, Integer> plansMap = getResourceMap(PLANS_URL);
-    @Getter(lazy=true) private static final Map<String, Integer> osMap = getResourceMap(OS_URL);
+    @Getter(lazy=true) private final List<CloudRegion> cloudRegions = loadCloudResources(REGIONS_URL, new VultrRegionParser());

@@ -64,0 +71,4 @@
+    private int initSnapshotOsId() {
+        final OsImage snapshot = getCloudOsImages().stream()
+                .filter(i -> i.getName().equals("Snapshot"))
+                .findFirst()

@@ -67,3 +83,3 @@
     public static final long SERVER_STOP_CHECK_INTERVAL = SECONDS.toMillis(5);
 
-    private static Map<String, Integer> getResourceMap(String uri) {
+    private <T> List<T> loadCloudResources(String uri, ResourceParser<T, List<T>> parser) {

@@ -366,1 +395,3 @@
-            final HttpRequestBean destroyKeyRequest = auth(new HttpRequestBean(POST, DESTROY_SSH_KEY_URL, keyData));
+    @Override public List<PackerImage> getPackerImages() {
+        final List<PackerImage> images = loadCloudResources(SNAPSHOT_URL, new VultrPackerImageParser(configuration.getVersion(), packerService.getPackerPublicKeyHash(), configuration.getJarSha()));
+        return images == null ? Collections.emptyList() : images;

@@ -367,0 +399,4 @@
+
+    public PackerImage getPackerImage(AnsibleInstallType installType) {
+        final List<PackerImage> images = getPackerImages();
+        return images == null ? null : images.stream()

@@ -43,29 +41,56 @@ public abstract class ComputeServiceDriverBase
     }
 
     @Autowired protected BubbleNodeDAO nodeDAO;
+    @Autowired protected PackerService packerService;

@@ -367,0 +444,4 @@
+                return tag != null && tag.contains("_"+installType.name()+"_") && tag.endsWith(jarSha);
+            });
+        } catch (IOException e) {
+            log.error("finalizeIncompletePackerRun: error listing servers: "+shortError(e), e);

@@ -78,4 +77,2 @@
         }
 
-        // Special handling when bubble has not been activated for bootstrapping ansible roles
-        if (activated() || !key.startsWith(ROLE_PATH)) return false;

@@ -327,3 +324,3 @@
 
     @Transactional(Transactional.TxType.REQUIRES_NEW)
-    private void deleteTransactional(@NonNull final String uuid) {
+    protected void deleteTransactional(@NonNull final String uuid) {

@@ -73,1 +68,3 @@
-                .collect(Collectors.toList());
+        final String[] installRoles = installType == AnsibleInstallType.sage
+                ? ApiConstants.ROLES_SAGE
+                : ApiConstants.ROLES_NODE;

@@ -124,6 +122,7 @@ public class StandardNetworkService implements NetworkService {
     @Autowired private NodeService nodeService;
     @Autowired private GeoService geoService;
     @Autowired private AnsiblePrepService ansiblePrep;
+    @Autowired private PackerService packerService;

@@ -0,0 +122,4 @@
+        // determine lat/lon to find closest cloud region to perform build in
+        final GeoLocation here = geoService.locate(account.getUuid(), getExternalIp());
+        final List<CloudRegionRelative> closestRegions = findClosestRegions(configuration, new SingletonList<>(cloud), null, here.getLatitude(), here.getLongitude());
+        if (empty(closestRegions)) return die("writePackerImages: no closest region could be determined");

@@ -174,0 +183,4 @@
+            super(meter.nn, meter.redis);
+            this.meter = meter;
+        }
+        @Override public void close() {}

@@ -238,3 +225,4 @@
             node.setState(BubbleNodeState.starting);
             nodeDAO.update(node);
 
+            final ExecutorService backgroundJobs = DaemonThreadFactory.fixedPool(3);

@@ -0,0 +15,4 @@
+
+    private static final long DNS_TIMEOUT = MINUTES.toMillis(60);
+
+    private CloudServiceDAO cloudDAO;

@@ -0,0 +12,4 @@
+
+public class NodeStartJob implements Runnable {
+
+    private StandardNetworkService networkService;

@@ -0,0 +51,4 @@
+    public static final AnsibleInstallType[] PACKER_TYPES = {AnsibleInstallType.sage, AnsibleInstallType.node};
+    public static final String PACKER_TEMPLATE = PACKER_DIR+"/packer.json.hbs";
+    public static final String PACKER_IMAGE_NAME_VAR = "packerImageName";
+    public static final String PACKER_IMAGE_PREFIX = "packer_bubble_";

@@ -0,0 +67,4 @@
+    public static final String VARIABLES_VAR = "packerVariables";
+    public static final String BUILD_REGION_VAR = "buildRegion";
+    public static final String IMAGE_REGIONS_VAR = "imageRegions";
+    public static final String BUILDERS_VAR = "builders";

@@ -0,0 +129,4 @@
+        // set environment variables
+        final Map<String, String> env = new HashMap<>();
+        for (NameAndValue variable : packerConfig.getVars()) {
+            env.put(variable.getName(), HandlebarsUtil.apply(configuration.getHandlebars(), variable.getValue(), ctx, '[', ']'));

@@ -0,0 +162,4 @@
+                } else {
+                    final List<CloudRegion> existingRegions = new ArrayList<>();
+                    for (PackerImage image : existingForInstallType) {
+                        existingRegions.addAll(Arrays.asList(image.getRegions()));

@@ -0,0 +165,4 @@
+                        existingRegions.addAll(Arrays.asList(image.getRegions()));
+                    }
+                    log.info("packer images already exist for "+installType+" for regions: "+existingRegions.stream().map(CloudRegion::getInternalName).collect(Collectors.joining(", ")));
+                    final List<String> existingRegionNames = existingRegions.stream().map(CloudRegion::getInternalName).collect(Collectors.toList());;

@@ -0,0 +177,4 @@
+                        if (imagesRef != null) imagesRef.set(images);
+                        return images;
+                    }
+                    ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(imagesToCreate));

@@ -0,0 +202,4 @@
+
+        final List<String> builderJsons = new ArrayList<>();
+        if (packerConfig.iterateRegions()) {
+            for (CloudRegion region : computeDriver.getRegions()) {

@@ -0,0 +267,4 @@
+    public void addAllRegions(ComputeServiceDriver computeDriver, Map<String, Object> ctx) {
+        ctx.put(IMAGE_REGIONS_VAR, toInnerStringList(computeDriver.getRegions().stream()
+                .map(CloudRegion::getInternalName)
+                .collect(Collectors.toList())));

@@ -0,0 +270,4 @@
+                .collect(Collectors.toList())));
+    }
+
+    private String toInnerStringList(List<String> list) {

@@ -0,0 +54,4 @@
+            if (images != null) return images;
+            activeJobs.computeIfAbsent(cacheKey, k -> {
+                final PackerJob packerJob = configuration.autowire(new PackerJob(cloud, installType, imagesRef));
+                return pool.submit(packerJob);