Change the SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME
The intergation test job has been broken, it seems because the replace TENANT => PROJECT change in devstack scrpts, see[1]. This patch change the SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME in devstack plugin. And to avoid with aodh change, this change temporarily skip the gabbits-live test. [1] https://review.openstack.org/#/c/281779/ Closes-Bug: #1548634 Change-Id: Ibb1f78d47311117f6718707c5961bc2841473924
This commit is contained in:
parent
08433892d1
commit
8d7def1f7a
@ -40,6 +40,8 @@
|
|||||||
# Save trace setting
|
# Save trace setting
|
||||||
XTRACE=$(set +o | grep xtrace)
|
XTRACE=$(set +o | grep xtrace)
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
|
# TODO(liusheng) Temporarily add this to avoid integration test failue, see bug1548634
|
||||||
|
export SERVICE_TENANT_NAME=$SERVICE_PROJECT_NAME
|
||||||
|
|
||||||
# Support potential entry-points console scripts in VENV or not
|
# Support potential entry-points console scripts in VENV or not
|
||||||
if [[ ${USE_VENV} = True ]]; then
|
if [[ ${USE_VENV} = True ]]; then
|
||||||
@ -175,7 +177,7 @@ function _ceilometer_create_accounts {
|
|||||||
|
|
||||||
if is_service_enabled swift; then
|
if is_service_enabled swift; then
|
||||||
# Ceilometer needs ResellerAdmin role to access Swift account stats.
|
# Ceilometer needs ResellerAdmin role to access Swift account stats.
|
||||||
get_or_add_user_project_role "ResellerAdmin" "ceilometer" $SERVICE_TENANT_NAME
|
get_or_add_user_project_role "ResellerAdmin" "ceilometer" $SERVICE_PROJECT_NAME
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -318,7 +320,7 @@ function configure_ceilometer {
|
|||||||
iniset $CEILOMETER_CONF service_credentials auth_type password
|
iniset $CEILOMETER_CONF service_credentials auth_type password
|
||||||
iniset $CEILOMETER_CONF service_credentials user_domain_id default
|
iniset $CEILOMETER_CONF service_credentials user_domain_id default
|
||||||
iniset $CEILOMETER_CONF service_credentials project_domain_id default
|
iniset $CEILOMETER_CONF service_credentials project_domain_id default
|
||||||
iniset $CEILOMETER_CONF service_credentials project_name $SERVICE_TENANT_NAME
|
iniset $CEILOMETER_CONF service_credentials project_name $SERVICE_PROJECT_NAME
|
||||||
iniset $CEILOMETER_CONF service_credentials username ceilometer
|
iniset $CEILOMETER_CONF service_credentials username ceilometer
|
||||||
iniset $CEILOMETER_CONF service_credentials password $SERVICE_PASSWORD
|
iniset $CEILOMETER_CONF service_credentials password $SERVICE_PASSWORD
|
||||||
iniset $CEILOMETER_CONF service_credentials region_name $REGION_NAME
|
iniset $CEILOMETER_CONF service_credentials region_name $REGION_NAME
|
||||||
|
Loading…
Reference in New Issue
Block a user