Browse code

Merge "devstack should put admin_tenant_id in tempest.conf file while setup"

Jenkins authored on 2014/06/18 04:47:10
Showing 1 changed files
... ...
@@ -149,6 +149,7 @@ function configure_tempest {
149 149
     TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
150 150
     ALT_USERNAME=${ALT_USERNAME:-alt_demo}
151 151
     ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo}
152
+    ADMIN_TENANT_ID=$(openstack project list | awk "/ admin / { print \$2 }")
152 153
 
153 154
     # If the ``DEFAULT_INSTANCE_TYPE`` not declared, use the new behavior
154 155
     # Tempest creates instane types for himself
... ...
@@ -256,6 +257,7 @@ function configure_tempest {
256 256
     iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME
257 257
     iniset $TEMPEST_CONFIG identity admin_password "$password"
258 258
     iniset $TEMPEST_CONFIG identity admin_tenant_name $ADMIN_TENANT_NAME
259
+    iniset $TEMPEST_CONFIG identity admin_tenant_id $ADMIN_TENANT_ID
259 260
     iniset $TEMPEST_CONFIG identity admin_domain_name $ADMIN_DOMAIN_NAME
260 261
     iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
261 262