From 611cd1fa9c4b9d70e339ff1290f680f2ff6a5878 Mon Sep 17 00:00:00 2001 From: Ayumu Ueha Date: Fri, 13 Sep 2024 00:15:26 +0000 Subject: [PATCH] Quick fix for python-openstackclient 7.1.0 The Tacker's gate fails during default VIM setup from when the version of python-openstackclient is updated to 7.1.0 [1]. This patch is a quick fix to resolve the errors by following changes: 1. Add `domain_id` argument to `get_or_create_user` function. 2. Change quota set command option: * Change `--default` option for default quota instead of `--class` option that is deprecated. * Add `--force` option for nfv procject. [1] https://review.opendev.org/c/openstack/requirements/+/928948 Change-Id: I7ab288c0cc959ff1b8b80d8169cd00269dcd69ae --- devstack/lib/tacker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/lib/tacker b/devstack/lib/tacker index d4dc9e6b8..4ceaa1611 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -438,7 +438,7 @@ function tacker_setup_default_vim_resources { echo "Create NFV VIM project $DEFAULT_VIM_PROJECT_NAME ..." get_or_create_project $DEFAULT_VIM_PROJECT_NAME echo "Create NFV VIM user $DEFAULT_VIM_USER ..." - get_or_create_user $DEFAULT_VIM_USER $DEFAULT_VIM_PASSWORD + get_or_create_user $DEFAULT_VIM_USER $DEFAULT_VIM_PASSWORD default get_or_add_user_project_role admin $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME # get_or_add_user_project_role advsvc $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME @@ -451,9 +451,9 @@ function tacker_setup_default_vim_resources { echo "Set up target openstack vim resources ..." openstack --os-cloud=devstack-admin quota set \ - --class --instances -1 --cores -1 --ram -1 default + --default --instances -1 --cores -1 --ram -1 default openstack --os-cloud=devstack-admin \ - quota set --ports -1 $DEFAULT_VIM_PROJECT_NAME + quota set --ports -1 $DEFAULT_VIM_PROJECT_NAME --force openstack --os-region-name $REGION_NAME --os-project-name $DEFAULT_VIM_PROJECT_NAME \ --os-user-domain-id default --os-username $DEFAULT_VIM_USER \