Merge "devstack should put admin_tenant_id in tempest.conf file while setup"
This commit is contained in:
commit
a4de9a9c35
@ -149,6 +149,7 @@ function configure_tempest {
|
|||||||
TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
|
TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
|
||||||
ALT_USERNAME=${ALT_USERNAME:-alt_demo}
|
ALT_USERNAME=${ALT_USERNAME:-alt_demo}
|
||||||
ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo}
|
ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo}
|
||||||
|
ADMIN_TENANT_ID=$(openstack project list | awk "/ admin / { print \$2 }")
|
||||||
|
|
||||||
# If the ``DEFAULT_INSTANCE_TYPE`` not declared, use the new behavior
|
# If the ``DEFAULT_INSTANCE_TYPE`` not declared, use the new behavior
|
||||||
# Tempest creates instane types for himself
|
# Tempest creates instane types for himself
|
||||||
@ -256,6 +257,7 @@ function configure_tempest {
|
|||||||
iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME
|
iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME
|
||||||
iniset $TEMPEST_CONFIG identity admin_password "$password"
|
iniset $TEMPEST_CONFIG identity admin_password "$password"
|
||||||
iniset $TEMPEST_CONFIG identity admin_tenant_name $ADMIN_TENANT_NAME
|
iniset $TEMPEST_CONFIG identity admin_tenant_name $ADMIN_TENANT_NAME
|
||||||
|
iniset $TEMPEST_CONFIG identity admin_tenant_id $ADMIN_TENANT_ID
|
||||||
iniset $TEMPEST_CONFIG identity admin_domain_name $ADMIN_DOMAIN_NAME
|
iniset $TEMPEST_CONFIG identity admin_domain_name $ADMIN_DOMAIN_NAME
|
||||||
iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
|
iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user