openstack
/
ironic
Code Issues Proposed changes

Merge "Comment out test options that already exists on tempest's tree"

This commit is contained in:
Jenkins 2016-02-14 11:08:25 +00:00 committed by Gerrit Code Review
parent aa1f251b69 bf6de0040f
commit c875ae8b7d
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ironic_tempest_plugin/config.py
View File

@ -28,39 +28,42 @@ baremetal_group = cfg.OptGroup(name='baremetal',
'live_migration, pause, rescue, resize, '
'shelve, snapshot, and suspend')
# NOTE(maurosr): Until liberty-eol we need to keep config options and tests
# on tempest's tree to test stable branches and thus we have to comment the
# options bellow to avoid duplication. Only new options should live here.
BaremetalGroup = [
cfg.StrOpt('catalog_type',
default='baremetal',
help="Catalog type of the baremetal provisioning service"),
cfg.BoolOpt('driver_enabled',
default=True,
help="Whether the Ironic nova-compute driver is enabled"),
cfg.StrOpt('driver',
default='fake',
help="Driver name which Ironic uses"),
cfg.StrOpt('endpoint_type',
default='publicURL',
choices=['public', 'admin', 'internal',
'publicURL', 'adminURL', 'internalURL'],
help="The endpoint type to use for the baremetal provisioning "
"service"),
# cfg.StrOpt('catalog_type',
# default='baremetal',
# help="Catalog type of the baremetal provisioning service"),
# cfg.BoolOpt('driver_enabled',
# default=True,
# help="Whether the Ironic nova-compute driver is enabled"),
# cfg.StrOpt('driver',
# default='fake',
# help="Driver name which Ironic uses"),
# cfg.StrOpt('endpoint_type',
# default='publicURL',
# choices=['public', 'admin', 'internal',
# 'publicURL', 'adminURL', 'internalURL'],
# help="The endpoint type to use for the baremetal provisioning"
# " service"),
cfg.IntOpt('deploywait_timeout',
default=15,
help="Timeout for Ironic node to reach the "
"wait-callback state after powering on."),
cfg.IntOpt('active_timeout',
default=300,
help="Timeout for Ironic node to completely provision"),
cfg.IntOpt('association_timeout',
default=30,
help="Timeout for association of Nova instance and Ironic "
"node"),
cfg.IntOpt('power_timeout',
default=60,
help="Timeout for Ironic power transitions."),
cfg.IntOpt('unprovision_timeout',
default=300,
help="Timeout for unprovisioning an Ironic node. "
"Takes longer since Kilo as Ironic performs an extra "
"step in Node cleaning.")
# cfg.IntOpt('active_timeout',
# default=300,
# help="Timeout for Ironic node to completely provision"),
# cfg.IntOpt('association_timeout',
# default=30,
# help="Timeout for association of Nova instance and Ironic "
# "node"),
# cfg.IntOpt('power_timeout',
# default=60,
# help="Timeout for Ironic power transitions."),
# cfg.IntOpt('unprovision_timeout',
# default=300,
# help="Timeout for unprovisioning an Ironic node. "
# "Takes longer since Kilo as Ironic performs an extra "
# "step in Node cleaning.")
]