From 177fe8586569886fd8490335d4a08301688907c0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 16 Jul 2024 01:33:33 +0900 Subject: [PATCH] Replace OS_TENANT_NAME ... because it was already removed[1] in favor of OS_PROJECT_NAME. Also disable openstack-cli-server because it breaks credential switch in ansible configuration tasks. [1] 608489cd59b0d0f6f82937abb6a317489ac4d7a4 Change-Id: I008f34ee5458d209941c72aa9bf3f4b5b9c997e7 --- roles/populate-manilaclient-config/tasks/main.yaml | 2 +- zuul.d/python-manilaclient-jobs.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/populate-manilaclient-config/tasks/main.yaml b/roles/populate-manilaclient-config/tasks/main.yaml index f94593421..aa94e217b 100644 --- a/roles/populate-manilaclient-config/tasks/main.yaml +++ b/roles/populate-manilaclient-config/tasks/main.yaml @@ -17,7 +17,7 @@ source {{ base_dir }}/devstack/openrc admin demo &>/dev/null iniset {{ manilaclient_config }} DEFAULT admin_username $OS_USERNAME - iniset {{ manilaclient_config }} DEFAULT admin_tenant_name $OS_TENANT_NAME + iniset {{ manilaclient_config }} DEFAULT admin_tenant_name $OS_PROJECT_NAME iniset {{ manilaclient_config }} DEFAULT admin_password $OS_PASSWORD iniset {{ manilaclient_config }} DEFAULT admin_auth_url $OS_AUTH_URL iniset {{ manilaclient_config }} DEFAULT admin_project_domain_id $OS_PROJECT_DOMAIN_ID diff --git a/zuul.d/python-manilaclient-jobs.yaml b/zuul.d/python-manilaclient-jobs.yaml index a76712821..0984a95f7 100644 --- a/zuul.d/python-manilaclient-jobs.yaml +++ b/zuul.d/python-manilaclient-jobs.yaml @@ -82,6 +82,9 @@ # Neutron services q-svc: true q-ovn-metadata-agent: true + # openstack-cli-server causes problem with credential switch in ansible + # task + openstack-cli-server: false - job: name: python-manilaclient-functional-fips