Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ apk add --no-cache --virtual .build-deps \
musl-dev \
openldap-dev
apk add --no-cache \
aria2 \
cdrkit \
coreutils \
git \
Expand Down
11 changes: 9 additions & 2 deletions osism/commands/manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,12 @@ def take_action(self, parsed_args):
"--cloud",
cloud,
"--deactivate",
# One web-download attempt only: the amphora image source is
# chronically slow, so retrying web-download just wastes another
# multi-minute doomed transfer. On the first failure the default
# --prefetch on-stuck falls back to aria2 + glance-direct.
"--stuck-retry",
"1",
"0",
]

task_signature = openstack.image_manager.si(
Expand All @@ -481,7 +485,10 @@ def take_action(self, parsed_args):
f"It takes a moment until task {task.task_id} (image-manager) has been started and output is visible here."
)

return handle_task(task, wait, format="script", timeout=3600)
# A larger budget than the other image tasks: on a stuck web-download
# the image-manager falls back to aria2 + glance-direct, which adds a
# local download and staging on top of the import.
return handle_task(task, wait, format="script", timeout=5400)


class Images(Command):
Expand Down