From cd80fd0b331c208b55065960b70863d7569ce184 Mon Sep 17 00:00:00 2001
From: Sergey Reshetnyak <sreshetniak@mirantis.com>
Date: Mon, 13 Mar 2017 11:52:25 +0300
Subject: [PATCH] Add admin credentials in config

Change-Id: I96ba171b27ce7f0a90cd3611fd0aef3a9250ccdd
---
 service/files/run-tempest.sh.j2 |  4 ++--
 service/files/tempest.conf.j2   | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/service/files/run-tempest.sh.j2 b/service/files/run-tempest.sh.j2
index 8622a63..58937ae 100644
--- a/service/files/run-tempest.sh.j2
+++ b/service/files/run-tempest.sh.j2
@@ -15,10 +15,10 @@ function publish_artifacts {
 export OS_AUTH_URL={{ address("keystone", keystone.admin_port, with_scheme=True) }}
 export OS_IDENTITY_API_VERSION=3
 export OS_PASSWORD={{ openstack.user_password }}
-export OS_PROJECT_DOMAIN_NAME=default
+export OS_PROJECT_DOMAIN_NAME=Default
 export OS_PROJECT_NAME={{ openstack.project_name }}
 export OS_USERNAME={{ openstack.user_name }}
-export OS_USER_DOMAIN_NAME=default
+export OS_USER_DOMAIN_NAME=Default
 {% if keystone.tls.enabled %}
 export OS_CACERT="/opt/ccp/etc/tls/ca.pem"
 {% endif %}
diff --git a/service/files/tempest.conf.j2 b/service/files/tempest.conf.j2
index eae481c..ef3ee2b 100644
--- a/service/files/tempest.conf.j2
+++ b/service/files/tempest.conf.j2
@@ -2,14 +2,7 @@
 log_file = /var/lib/rally/tempest.log
 
 [compute]
-min_microversion = 2.1
-{% if rally.tempest.openstack_release == "mitaka" %}
-max_microversion = 2.25
-{% elif rally.tempest.openstack_release == "newton" %}
-max_microversion = 2.38
-{% elif rally.tempest.openstack_release == "ocata" %}
-max_microversion = 2.42
-{% endif %}
+max_microversion = latest
 min_compute_nodes = {{ rally.tempest.compute.min_compute_nodes }}
 
 {% set compute_feature = rally.tempest.compute_feature %}
@@ -20,6 +13,14 @@ allow_port_security_disabled = {{ compute_feature.allow_port_security_disabled }
 attach_encrypted_volume = {{ compute_feature.attach_encrypted_volume }}
 personality = {{ compute_feature.personality }}
 
+[auth]
+use_dynamic_credentials = True
+tempest_roles = {{ openstack.role_name }}
+admin_domain_name = Default
+admin_project_name = {{ openstack.project_name }}
+admin_password = {{ openstack.user_password }}
+admin_username = {{ openstack.user_name }}
+
 [identity]
 {% if rally.tempest.openstack_release == "mitaka" %}
 admin_domain_scope = False