Merge "Change os_tenant_name to os_project_name in tests configuration script"
This commit is contained in:
commit
b8020abd4b
|
@ -53,7 +53,7 @@ An example test.conf file::
|
|||
os_auth_url=http://192.168.0.2:5000/v2.0/
|
||||
os_username=admin
|
||||
os_password=admin
|
||||
os_tenant_name=admin
|
||||
os_project_name=admin
|
||||
|
||||
If you are testing ironic in standalone mode, only the parameters
|
||||
'auth_strategy', 'os_auth_token' and 'ironic_url' are required;
|
||||
|
|
|
@ -42,7 +42,7 @@ class FunctionalTestBase(base.ClientTestBase):
|
|||
client = base.CLIClient(cli_dir=cli_dir,
|
||||
username=config['os_username'],
|
||||
password=config['os_password'],
|
||||
tenant_name=config['os_tenant_name'],
|
||||
tenant_name=config['os_project_name'],
|
||||
uri=config['os_auth_url'])
|
||||
for keystone_object in 'user', 'project':
|
||||
domain_attr = 'os_%s_domain_id' % keystone_object
|
||||
|
@ -79,7 +79,7 @@ class FunctionalTestBase(base.ClientTestBase):
|
|||
keystone_v3_conf_settings = []
|
||||
if auth_strategy == 'keystone':
|
||||
conf_settings += ['os_auth_url', 'os_username',
|
||||
'os_password', 'os_tenant_name']
|
||||
'os_password', 'os_project_name']
|
||||
keystone_v3_conf_settings += ['os_user_domain_id',
|
||||
'os_project_domain_id']
|
||||
else:
|
||||
|
|
|
@ -19,11 +19,11 @@ os_auth_url=$OS_AUTH_URL
|
|||
os_identity_api_version = $OS_IDENTITY_API_VERSION
|
||||
os_username=$OS_USERNAME
|
||||
os_password=$OS_PASSWORD
|
||||
os_tenant_name=$OS_TENANT_NAME
|
||||
os_project_name=$OS_PROJECT_NAME
|
||||
os_user_domain_id=$OS_USER_DOMAIN_ID
|
||||
os_project_domain_id=$OS_PROJECT_DOMAIN_ID
|
||||
os_service_type=baremetal
|
||||
os_endpoint_type=public
|
||||
END
|
||||
fi
|
||||
tox -e functional
|
||||
tox -e functional
|
||||
|
|
Loading…
Reference in New Issue