Skip to content

Commit 2d7f7d3

Browse files
authored
Bugfix: gracefully handle incorrectly set min_disk property (#689)
Signed-off-by: Matthias Büchse <[email protected]>
1 parent c580700 commit 2d7f7d3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Tests/iaas/entropy/entropy-check.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,16 +321,17 @@ def create_vm(env, all_flavors, image, server_name=SERVER_NAME):
321321
# try to pick a frugal flavor
322322
flavor = min(flavors, key=lambda flv: flv.vcpus + flv.ram / 3.0 + flv.disk / 10.0)
323323
userdata = next((value for key, value in SERVER_USERDATA.items() if image.name.lower().startswith(key)), None)
324+
volume_size = max(image.min_disk, 8) # sometimes, the min_disk property is not set correctly
324325
# create a server with the image and the flavor as well as
325326
# the previously created keys and security group
326327
logger.debug(
327328
f"Creating instance of image '{image.name}' using flavor '{flavor.name}' and "
328-
f"{image.min_disk} GiB ephemeral boot volume"
329+
f"{volume_size} GiB ephemeral boot volume"
329330
)
330331
server = env.conn.create_server(
331332
server_name, image=image, flavor=flavor, key_name=env.keypair.name, network=env.network,
332333
security_groups=[env.sec_group.id], userdata=userdata, wait=True, timeout=500, auto_ip=True,
333-
boot_from_volume=True, terminate_volume=True, volume_size=image.min_disk,
334+
boot_from_volume=True, terminate_volume=True, volume_size=volume_size,
334335
)
335336
logger.debug(f"Server '{server_name}' ('{server.id}') has been created")
336337
return server

0 commit comments

Comments
 (0)