openstack/heat
Code Issues Proposed changes

Merge "Fix test_encryption_vol_type to take admin creds from conf"

Browse Source
This commit is contained in:
Jenkins
2016-03-02 10:17:29 +00:00
committed by Gerrit Code Review
parent a2f8a78018 c7ab4e82af
commit bab3427f37
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
heat_integrationtests/common/config.py
View File

@@ -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