diff options
| author | Rakesh H S <rh-s@hpe.com> | 2016-02-18 18:54:00 +0530 |
|---|---|---|
| committer | Rakesh H S <rh-s@hpe.com> | 2016-02-19 12:50:13 +0530 |
| commit | c7ab4e82afc4cf3fa7d130ecaad5ace18eb46852 (patch) | |
| tree | a685ccf6510ae6a698659e49b52a07facfe102a0 /heat_integrationtests/common | |
| parent | 714627b39b23660f6d2ae322fb6c35fe16bec31b (diff) | |
| download | heat-c7ab4e82afc4cf3fa7d130ecaad5ace18eb46852.tar.gz | |
Fix test_encryption_vol_type to take admin creds from conf
Heat integration test test_encryption_vol_type will not work in environments
where admin user is named differently or does not have the same password as
that of the demo user.
The admin credentials is now made available via heat_integrationtests.conf.
The tests which require admin privileges should be run only if admin
credentials are available and use the same.
Change-Id: I5f329be6d4c4249763e0aec8696fb87605a0812a
Closes-Bug: #1546993
Diffstat (limited to 'heat_integrationtests/common')
| -rw-r--r-- | heat_integrationtests/common/config.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/heat_integrationtests/common/config.py b/heat_integrationtests/common/config.py index 39c084681..6d3560026 100644 --- a/heat_integrationtests/common/config.py +++ b/heat_integrationtests/common/config.py @@ -21,10 +21,15 @@ IntegrationTestGroup = [ cfg.StrOpt('username', default=os.environ.get('OS_USERNAME'), - help="Username to use for API requests."), + help="Username to use for non admin API requests."), cfg.StrOpt('password', default=os.environ.get('OS_PASSWORD'), - help="API key to use when authenticating.", + help="Non admin API key to use when authenticating.", + secret=True), + cfg.StrOpt('admin_username', + help="Username to use for admin API requests."), + cfg.StrOpt('admin_password', + help="Admin API key to use when authentication.", secret=True), cfg.StrOpt('tenant_name', default=(os.environ.get('OS_PROJECT_NAME') or |