From 03523256179905b0bf8afd7ec0facb427e29de82 Mon Sep 17 00:00:00 2001
From: Andrea Frittoli <andrea.frittoli@hp.com>
Date: Tue, 8 Apr 2014 13:43:56 +0100
Subject: [PATCH] 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
---
 lib/tempest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/tempest b/lib/tempest
index 0b5f332672..ebee315d53 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -153,6 +153,7 @@ function configure_tempest {
     # user and tenant are set up...
     ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
     ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-admin}
+    ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-Default}
     TEMPEST_USERNAME=${TEMPEST_USERNAME:-demo}
     TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
     ALT_USERNAME=${ALT_USERNAME:-alt_demo}
@@ -267,6 +268,7 @@ function configure_tempest {
     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_domain_name $ADMIN_DOMAIN_NAME
     iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
 
     # Image