openstack/horizon
Code Issues Proposed changes

Merge "Use default values in horizon.conf"

Browse Source
This commit is contained in:
Jenkins
2015-06-25 07:27:48 +00:00
committed by Gerrit Code Review
parent b4dbc62667 81eb5113df
commit d6a9cc32e6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstack_dashboard/test/integration_tests/config.py
View File

@@ -32,7 +32,7 @@ IdentityGroup = [
default='demo', default='demo',
help="Username to use for non-admin API requests."), help="Username to use for non-admin API requests."),
cfg.StrOpt('password', cfg.StrOpt('password',
default='pass', default='secretadmin',
help="API key to use when authenticating.", help="API key to use when authenticating.",
secret=True), secret=True),
cfg.StrOpt('admin_username', cfg.StrOpt('admin_username',
@@ -40,7 +40,7 @@ IdentityGroup = [
help="Administrative Username to use for admin API " help="Administrative Username to use for admin API "
"requests."), "requests."),
cfg.StrOpt('admin_password', cfg.StrOpt('admin_password',
default='pass', default='secretadmin',
help="API key to use when authenticating as admin.", help="API key to use when authenticating as admin.",
secret=True), secret=True),
] ]
@@ -54,7 +54,8 @@ ImageGroup = [
AvailableServiceGroup = [ AvailableServiceGroup = [
cfg.BoolOpt('sahara', cfg.BoolOpt('sahara',
default=False) default=True,
help='Whether is Sahara expected to be available')
] ]
SeleniumGroup = [ SeleniumGroup = [
@@ -62,7 +63,7 @@ SeleniumGroup = [
default=10, default=10,
help="Implicit wait timeout in seconds"), help="Implicit wait timeout in seconds"),
cfg.IntOpt('explicit_wait', cfg.IntOpt('explicit_wait',
default=10, default=300,
help="Explicit wait timeout in seconds"), help="Explicit wait timeout in seconds"),
cfg.IntOpt('page_timeout', cfg.IntOpt('page_timeout',
default=30, default=30,