openstack
/
heat
Code Issues Proposed changes

Use both domain id and name 

devstack has made keystone v3 the default, it seems
the env variables for domain names are not set.

Change-Id: Ief9314b81f8b7624ceb390c432d6487fce5b4a5e
Closes-Bug: #1646343
This commit is contained in:
rabi 2016-12-01 09:54:37 +05:30
parent 7da7e2612e
commit 35c6ee5ac4
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat_integrationtests/common/clients.py
View File

@ -123,6 +123,8 @@ class ClientManager(object):
password=self._password())
def _get_identity_client(self):
user_domain_id = self.conf.user_domain_id
project_domain_id = self.conf.project_domain_id
user_domain_name = self.conf.user_domain_name
project_domain_name = self.conf.project_domain_name
kwargs = {
@ -134,6 +136,8 @@ class ClientManager(object):
# keystone v2 can't ignore domain details
if self.auth_version == '3':
kwargs.update({
'user_domain_id': user_domain_id,
'project_domain_id': project_domain_id,
'user_domain_name': user_domain_name,
'project_domain_name': project_domain_name})
auth = password.Password(**kwargs)

6
heat_integrationtests/common/config.py
View File

@ -53,6 +53,12 @@ HeatGroup = [
cfg.StrOpt('project_domain_name',
help="Project domain name, if keystone v3 auth_url"
"is used"),
cfg.StrOpt('user_domain_id',
help="User domain id, if keystone v3 auth_url"
"is used"),
cfg.StrOpt('project_domain_id',
help="Project domain id, if keystone v3 auth_url"
"is used"),
cfg.StrOpt('region',
help="The region name to use"),
cfg.StrOpt('instance_type',

6
heat_integrationtests/functional/test_event_sinks.py
View File

@ -43,7 +43,11 @@ resources:
'os_username': self.conf.username,
'os_password': self.conf.password,
'os_project_name': self.conf.tenant_name,
'os_auth_url': self.conf.auth_url
'os_auth_url': self.conf.auth_url,
'os_user_domain_id': self.conf.user_domain_id,
'os_project_domain_id': self.conf.project_domain_id,
'os_user_domain_name': self.conf.user_domain_name,
'os_project_domain_name': self.conf.project_domain_name
}
}
}

2
heat_integrationtests/prepare_test_env.sh
View File

@ -33,6 +33,8 @@ iniset $conf_file heat_plugin username $OS_USERNAME
iniset $conf_file heat_plugin password $OS_PASSWORD
iniset $conf_file heat_plugin tenant_name $OS_PROJECT_NAME
iniset $conf_file heat_plugin auth_url $OS_AUTH_URL
iniset $conf_file heat_plugin user_domain_id $OS_USER_DOMAIN_ID
iniset $conf_file heat_plugin project_domain_id $OS_PROJECT_DOMAIN_ID
iniset $conf_file heat_plugin user_domain_name $OS_USER_DOMAIN_NAME
iniset $conf_file heat_plugin project_domain_name $OS_PROJECT_DOMAIN_NAME
iniset $conf_file heat_plugin region $OS_REGION_NAME