devstack should put admin_tenant_id in tempest.conf file while setup
Some of the test cases in tempest related to quota use
admin_tenant_name, ideally it should use admin_tenant_id.
As tempest.conf file does not contains admin_tenant_id
it should also be updated. tempest.conf file is generated
by devstack while setup of openstack, changes should be made
in devstack so as to put admin_tenant_id in tempest conf file.
Change-Id: I62baf5b1e21ebf8d3b511624c54741015b304955
Closes-Bug: #1321624
diff --git a/lib/tempest b/lib/tempest
index 79412f9..9b16e11 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -148,6 +148,7 @@
TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
ALT_USERNAME=${ALT_USERNAME:-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
# Tempest creates instane types for himself
@@ -258,6 +259,7 @@
iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME
iniset $TEMPEST_CONFIG identity admin_password "$password"
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 auth_version ${TEMPEST_AUTH_VERSION:-v2}