Rebuild control slave using non-optimized version first

Change-Id: Icd916f399b2dcc1bb3877f876acbb3b89aca1caa
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/packer/templates/basebuild-agl-test-slave.json b/packer/templates/basebuild-agl-test-slave.json
index 7ac3215..02c0f8b 100644 (file)
--- a/packer/templates/basebuild-agl-test-slave.json
+++ b/packer/templates/basebuild-agl-test-slave.json
@@ -29,9 +29,6 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
       "flavor": "v2-standard-16-iops",
-      "image_disk_format": "qcow2",
-      "use_blockstorage_volume": true,
-      "volume_size": "400",
       "metadata": {
         "ci_managed": "yes"
       }

diff --git a/packer/templates/basebuild-control-slave.json b/packer/templates/basebuild-control-slave.json
index 4a4be69..f87c3ae 100644 (file)
--- a/packer/templates/basebuild-control-slave.json
+++ b/packer/templates/basebuild-control-slave.json
@@ -28,10 +28,7 @@
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
-      "flavor": "v2-standard-16-iops",
-      "image_disk_format": "qcow2",
-      "use_blockstorage_volume": true,
-      "volume_size": "10",
+      "flavor": "v2-standard-16",
       "metadata": {
         "ci_managed": "yes"
       }

diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index c55d53a..c65c9c3 100644 (file)
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -29,9 +29,6 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
       "flavor": "v2-standard-16-iops",
-      "image_disk_format": "qcow2",
-      "use_blockstorage_volume": true,
-      "volume_size": "10",
       "metadata": {
         "ci_managed": "yes"
       }