Skip to content

Synchronise 2026.1 with upstream #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 3 commits into
base: stackhpc/2026.1
Choose a base branch
from
Open

Synchronise 2026.1 with upstream #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72d25d9
share: fix malformed log format strings in backup continuation handlers
akintewe Apr 8, 2026
9785694
Pull container image from quay.io
gouthampacha Jul 13, 2026
9d3ab96
Merge "Pull container image from quay.io" into stable/2026.1
Jul 16, 2026
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
29 changes: 21 additions & 8 deletions devstack/plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,14 +935,27 @@ function download_image {
}

function import_docker_service_image_ubuntu {
GZIPPED_IMG_NAME=`basename "$MANILA_DOCKER_IMAGE_URL"`
IMG_NAME_LOAD=${GZIPPED_IMG_NAME%.*}
LOCAL_IMG_NAME=${IMG_NAME_LOAD%.*}
if [[ "$(sudo docker images -q $LOCAL_IMG_NAME)" == "" ]]; then
download_image $MANILA_DOCKER_IMAGE_URL
# Import image in Docker
gzip -d $FILES/$GZIPPED_IMG_NAME
sudo docker load --input $FILES/$IMG_NAME_LOAD
if [[ $MANILA_DOCKER_IMAGE_URL == *"/"*":"* ]] || [[ $MANILA_DOCKER_IMAGE_URL == *"/"*"/"* ]]; then
# Registry reference (e.g., quay.io/org/image:tag)
if [[ "$(sudo docker images -q $MANILA_DOCKER_IMAGE_URL)" == "" ]]; then
sudo docker pull "$MANILA_DOCKER_IMAGE_URL"
fi
sudo docker tag "$MANILA_DOCKER_IMAGE_URL" manila-docker-container
else
# Tarball URL (http/https/file)
GZIPPED_IMG_NAME=$(basename "$MANILA_DOCKER_IMAGE_URL")
IMG_NAME_LOAD=${GZIPPED_IMG_NAME%.*}
LOCAL_IMG_NAME=${IMG_NAME_LOAD%.*}
if [[ "$(sudo docker images -q $LOCAL_IMG_NAME)" == "" ]]; then
download_image $MANILA_DOCKER_IMAGE_URL
if [[ $MANILA_DOCKER_IMAGE_URL == file* ]]; then
local src_path
src_path=$(echo "$MANILA_DOCKER_IMAGE_URL" | sed "s|^file://||")
cp "$src_path" "$FILES/$GZIPPED_IMG_NAME"
fi
gzip -d "$FILES/$GZIPPED_IMG_NAME"
sudo docker load --input "$FILES/$IMG_NAME_LOAD"
fi
fi
}

Expand Down
4 changes: 1 addition & 3 deletions devstack/settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,7 @@ MANILA_ZFSONLINUX_REPLICATION_DOMAIN=${MANILA_ZFSONLINUX_REPLICATION_DOMAIN:-"ZF
MANILA_CONTAINER_DRIVER=${MANILA_CONTAINER_DRIVER:-"manila.share.drivers.container.driver.ContainerShareDriver"}
MANILA_DOCKER_IMAGE_ALIAS=${MANILA_DOCKER_IMAGE_ALIAS:-"manila_docker_image"}
MANILA_CONTAINER_VOLUME_GROUP_NAME=${MANILA_CONTAINER_VOLUME_GROUP_NAME:-"manila_docker_volumes"}
# (aovchinnikov): This location is temporary and will be changed to a
# permanent one as soon as possible.
MANILA_DOCKER_IMAGE_URL=${MANILA_DOCKER_IMAGE_URL:-"https://github.com/a-ovchinnikov/manila-image-elements-lxd-images/releases/download/0.1.0/manila-docker-container.tar.gz"}
MANILA_DOCKER_IMAGE_URL=${MANILA_DOCKER_IMAGE_URL:-"quay.io/openstack-manila/manila-docker-container:latest"}

# Network Plugin
MANILA_NETWORK_API_CLASS=${MANILA_NETWORK_API_CLASS:-"manila.network.neutron.neutron_network_plugin.NeutronBindNetworkPlugin"}
Expand Down
4 changes: 2 additions & 2 deletions manila/share/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5653,7 +5653,7 @@ def create_backup_continue(self, context):
backup_id)
except Exception:
LOG.warning("Failed to get progress of share %(share)s "
"backing up in share_backup %(backup).",
"backing up in share_backup %(backup)s.",
{'share': share_id, 'backup': backup_id})
self.db.share_update(
context, share_id,
Expand Down Expand Up @@ -5790,7 +5790,7 @@ def restore_backup_continue(self, context):
backup_id)
except Exception:
LOG.exception("Failed to get progress of share_backup "
"%(backup)s restoring in share %(share).",
"%(backup)s restoring in share %(share)s.",
{'share': share_id, 'backup': backup_id})
self.db.share_update(
context, share_id,
Expand Down