openstack/tempest
Code Issues Proposed changes

Merge "Remove unused configuration variables"

Browse Source
This commit is contained in:
Jenkins
2012-12-04 14:59:32 +00:00
committed by Gerrit Code Review
parent 4ef897c9fa 9492d355c4
commit 10f84cea01
3 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
etc/tempest.conf.sample
View File

@@ -210,12 +210,8 @@ build_timeout = 300
[object-storage] [object-storage]
# This section contains configuration options used when executing tests # This section contains configuration options used when executing tests
# against the OpenStack Object Storage API. # against the OpenStack Object Storage API.
# This should be the username of a user WITHOUT administrative privileges
username = admin # You can configure the credentials in the compute section
# The above non-administrative user's password
password = password
# The above non-administrative user's tenant name
tenant_name = admin
# The type of endpoint for an Object Storage API service. Unless you have a # The type of endpoint for an Object Storage API service. Unless you have a
# custom Keystone service catalog implementation, you probably want to leave # custom Keystone service catalog implementation, you probably want to leave

7
etc/tempest.conf.tpl
View File

@@ -181,11 +181,8 @@ build_timeout = %VOLUME_BUILD_TIMEOUT%
# This section contains configuration options used when executing tests # This section contains configuration options used when executing tests
# against the OpenStack Object Storage API. # against the OpenStack Object Storage API.
# This should be the username of a user WITHOUT administrative privileges # This should be the username of a user WITHOUT administrative privileges
username = %USERNAME%
# The above non-administrative user's password # You can configure the credentials in the compute section
password = %PASSWORD%
# The above non-administrative user's tenant name
tenant_name = %TENANT_NAME%
# The type of endpoint for an Object Storage API service. Unless you have a # The type of endpoint for an Object Storage API service. Unless you have a
# custom Keystone service catalog implementation, you probably want to leave # custom Keystone service catalog implementation, you probably want to leave

15
tempest/config.py
View File

@@ -399,21 +399,6 @@ class ObjectStorageConfig(BaseConfig):
SECTION_NAME = "object-storage" SECTION_NAME = "object-storage"
@property
def username(self):
"""Username to use for Object-Storage API requests."""
return self.get("username", "admin")
@property
def tenant_name(self):
"""Tenant name to use for Object-Storage API requests."""
return self.get("tenant_name", "admin")
@property
def password(self):
"""API key to use when authenticating."""
return self.get("password", "password")
@property @property
def catalog_type(self): def catalog_type(self):
"""Catalog type of the Object-Storage service.""" """Catalog type of the Object-Storage service."""