Use default values in horizon.conf

Default values in horizon.conf and config.py differs.

Closes-Bug: 1433123
Partially implements blueprint: selenium-integration-testing
Change-Id: I2975ca696949969eabd7213f99229ff4d139bec4
This commit is contained in:
Martin Pavlasek 2015-03-17 15:19:31 +01:00 committed by Martin Pavlásek
parent e44d95fa21
commit 81eb5113df

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,