Browse code
Inject all account details in tempest.conf
The tempest configuration function did not inject all account
details in tempest.conf. The only reason why it worked, was
because tempest uses default config values which are valid for
the current devstack setup.
To remove this dependency, two patches are needed:
- this one in devstack, to inject all values
- https://review.openstack.org/#/c/77602/ in tempest, to change
default values to None
Partially fixes bug 1287191
Conflicts:
lib/tempest
Change-Id: I01507b142703a1ff66707464b9a743e9d0ca3e01
(cherry picked from commit d46d9dd8de00d07eee9170365b1a025f0fc01ed9)
Andrea Frittoli authored on 2014/03/05 22:38:19Showing 1 changed files
| ... | ... |
@@ -131,8 +131,12 @@ function configure_tempest() {
|
| 131 | 131 |
|
| 132 | 132 |
password=${ADMIN_PASSWORD:-secrete}
|
| 133 | 133 |
|
| 134 |
- # See files/keystone_data.sh where alt_demo user |
|
| 135 |
- # and tenant are set up... |
|
| 134 |
+ # See files/keystone_data.sh and stack.sh where admin, demo and alt_demo |
|
| 135 |
+ # user and tenant are set up... |
|
| 136 |
+ ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
|
|
| 137 |
+ ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-admin}
|
|
| 138 |
+ TEMPEST_USERNAME=${TEMPEST_USERNAME:-demo}
|
|
| 139 |
+ TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
|
|
| 136 | 140 |
ALT_USERNAME=${ALT_USERNAME:-alt_demo}
|
| 137 | 141 |
ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo}
|
| 138 | 142 |
|
| ... | ... |
@@ -216,11 +220,16 @@ function configure_tempest() {
|
| 216 | 216 |
|
| 217 | 217 |
# Identity |
| 218 | 218 |
iniset $TEMPEST_CONF identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/" |
| 219 |
+ iniset $TEMPEST_CONF identity uri_v3 "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v3/" |
|
| 220 |
+ iniset $TEMPEST_CONF identity username $TEMPEST_USERNAME |
|
| 219 | 221 |
iniset $TEMPEST_CONF identity password "$password" |
| 222 |
+ iniset $TEMPEST_CONF identity tenant_name $TEMPEST_TENANT_NAME |
|
| 220 | 223 |
iniset $TEMPEST_CONF identity alt_username $ALT_USERNAME |
| 221 | 224 |
iniset $TEMPEST_CONF identity alt_password "$password" |
| 222 | 225 |
iniset $TEMPEST_CONF identity alt_tenant_name $ALT_TENANT_NAME |
| 226 |
+ iniset $TEMPEST_CONF identity admin_username $ADMIN_USERNAME |
|
| 223 | 227 |
iniset $TEMPEST_CONF identity admin_password "$password" |
| 228 |
+ iniset $TEMPEST_CONF identity admin_tenant_name $ADMIN_TENANT_NAME |
|
| 224 | 229 |
|
| 225 | 230 |
# Image |
| 226 | 231 |
# for the gate we want to be able to override this variable so we aren't |
| ... | ... |
@@ -251,7 +260,9 @@ function configure_tempest() {
|
| 251 | 251 |
iniset $TEMPEST_CONF compute use_block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
|
| 252 | 252 |
|
| 253 | 253 |
# Compute admin |
| 254 |
+ iniset $TEMPEST_CONF "compute-admin" username $ADMIN_USERNAME |
|
| 254 | 255 |
iniset $TEMPEST_CONF "compute-admin" password "$password" # DEPRECATED |
| 256 |
+ iniset $TEMPEST_CONF "compute-admin" tenant_name $ADMIN_TENANT_NAME |
|
| 255 | 257 |
|
| 256 | 258 |
iniset $TEMPEST_CONF network api_version 2.0 |
| 257 | 259 |
iniset $TEMPEST_CONF network tenant_networks_reachable "$tenant_networks_reachable" |