Browse code
Inject the domain name for devstack in tempest
A new setting for the keystone domain name is introduced in
tempest by change https://review.openstack.org/#/c/81872/.
The default value in tempest is set to None, so that it is
not devstack specific. It's up to devstack to configure
the name of the keystone domain defined in devstack.
Partially implements bp multi-keystone-api-version-tests
Change-Id: I3d1406407759e1fdce0704fa2d6aa025f23a5f08
Andrea Frittoli authored on 2014/04/08 21:43:56Showing 1 changed files
| ... | ... |
@@ -153,6 +153,7 @@ function configure_tempest {
|
| 153 | 153 |
# user and tenant are set up... |
| 154 | 154 |
ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
|
| 155 | 155 |
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-admin}
|
| 156 |
+ ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-Default}
|
|
| 156 | 157 |
TEMPEST_USERNAME=${TEMPEST_USERNAME:-demo}
|
| 157 | 158 |
TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
|
| 158 | 159 |
ALT_USERNAME=${ALT_USERNAME:-alt_demo}
|
| ... | ... |
@@ -267,6 +268,7 @@ function configure_tempest {
|
| 267 | 267 |
iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME |
| 268 | 268 |
iniset $TEMPEST_CONFIG identity admin_password "$password" |
| 269 | 269 |
iniset $TEMPEST_CONFIG identity admin_tenant_name $ADMIN_TENANT_NAME |
| 270 |
+ iniset $TEMPEST_CONFIG identity admin_domain_name $ADMIN_DOMAIN_NAME |
|
| 270 | 271 |
iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
|
| 271 | 272 |
|
| 272 | 273 |
# Image |