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
This commit is contained in:
Takashi Kajinami 2024-07-16 01:33:33 +09:00
parent a14eb3adf7
commit 177fe85865
2 changed files with 4 additions and 1 deletions

View File

@ -17,7 +17,7 @@
source {{ base_dir }}/devstack/openrc admin demo &>/dev/null source {{ base_dir }}/devstack/openrc admin demo &>/dev/null
iniset {{ manilaclient_config }} DEFAULT admin_username $OS_USERNAME 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_password $OS_PASSWORD
iniset {{ manilaclient_config }} DEFAULT admin_auth_url $OS_AUTH_URL iniset {{ manilaclient_config }} DEFAULT admin_auth_url $OS_AUTH_URL
iniset {{ manilaclient_config }} DEFAULT admin_project_domain_id $OS_PROJECT_DOMAIN_ID iniset {{ manilaclient_config }} DEFAULT admin_project_domain_id $OS_PROJECT_DOMAIN_ID

View File

@ -82,6 +82,9 @@
# Neutron services # Neutron services
q-svc: true q-svc: true
q-ovn-metadata-agent: true q-ovn-metadata-agent: true
# openstack-cli-server causes problem with credential switch in ansible
# task
openstack-cli-server: false
- job: - job:
name: python-manilaclient-functional-fips name: python-manilaclient-functional-fips