openstack/deb-ironic
Code Issues Proposed changes

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

Browse Source 
Since we can't remove ironic's  tests and options from tempest's tree
until liberty-eol (to tests stable branches) we can't have such options
on our tree, except of course new options like deploywait_timeout.

Change-Id: If98cfea3e1235f6ffcdb1f47d6c64e65d094168f
This commit is contained in:
Mauro S. M. Rodrigues 2016-02-03 14:14:58 -05:00 committed by Mauro Rodrigues
parent 4fe84bcaf7
commit bf6de0040f
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, ' 'live_migration, pause, rescue, resize, '
'shelve, snapshot, and suspend') '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 = [ BaremetalGroup = [
cfg.StrOpt('catalog_type', # cfg.StrOpt('catalog_type',
default='baremetal', # default='baremetal',
help="Catalog type of the baremetal provisioning service"), # help="Catalog type of the baremetal provisioning service"),
cfg.BoolOpt('driver_enabled', # cfg.BoolOpt('driver_enabled',
default=True, # default=True,
help="Whether the Ironic nova-compute driver is enabled"), # help="Whether the Ironic nova-compute driver is enabled"),
cfg.StrOpt('driver', # cfg.StrOpt('driver',
default='fake', # default='fake',
help="Driver name which Ironic uses"), # help="Driver name which Ironic uses"),
cfg.StrOpt('endpoint_type', # cfg.StrOpt('endpoint_type',
default='publicURL', # default='publicURL',
choices=['public', 'admin', 'internal', # choices=['public', 'admin', 'internal',
'publicURL', 'adminURL', 'internalURL'], # 'publicURL', 'adminURL', 'internalURL'],
help="The endpoint type to use for the baremetal provisioning " # help="The endpoint type to use for the baremetal provisioning"
"service"), # " service"),
cfg.IntOpt('deploywait_timeout', cfg.IntOpt('deploywait_timeout',
default=15, default=15,
help="Timeout for Ironic node to reach the " help="Timeout for Ironic node to reach the "
"wait-callback state after powering on."), "wait-callback state after powering on."),
cfg.IntOpt('active_timeout', # cfg.IntOpt('active_timeout',
default=300, # default=300,
help="Timeout for Ironic node to completely provision"), # help="Timeout for Ironic node to completely provision"),
cfg.IntOpt('association_timeout', # cfg.IntOpt('association_timeout',
default=30, # default=30,
help="Timeout for association of Nova instance and Ironic " # help="Timeout for association of Nova instance and Ironic "
"node"), # "node"),
cfg.IntOpt('power_timeout', # cfg.IntOpt('power_timeout',
default=60, # default=60,
help="Timeout for Ironic power transitions."), # help="Timeout for Ironic power transitions."),
cfg.IntOpt('unprovision_timeout', # cfg.IntOpt('unprovision_timeout',
default=300, # default=300,
help="Timeout for unprovisioning an Ironic node. " # help="Timeout for unprovisioning an Ironic node. "
"Takes longer since Kilo as Ironic performs an extra " # "Takes longer since Kilo as Ironic performs an extra "
"step in Node cleaning.") # "step in Node cleaning.")
] ]