Merge remote-tracking branch 'inspector/master'
diff --git a/ironic_tempest_plugin/config.py b/ironic_tempest_plugin/config.py
index 661b89c..aa416b8 100644
--- a/ironic_tempest_plugin/config.py
+++ b/ironic_tempest_plugin/config.py
@@ -18,11 +18,15 @@
from tempest import config # noqa
-service_option = cfg.BoolOpt('ironic',
- default=False,
- help='Whether or not Ironic is expected to be '
- 'available')
+ironic_service_option = cfg.BoolOpt('ironic',
+ default=False,
+ help='Whether or not ironic is expected '
+ 'to be available')
+inspector_service_option = cfg.BoolOpt("ironic-inspector",
+ default=True,
+ help="Whether or not ironic-inspector "
+ "is expected to be available")
baremetal_group = cfg.OptGroup(name='baremetal',
title='Baremetal provisioning service options',
@@ -34,6 +38,12 @@
'live_migration, pause, rescue, resize, '
'shelve, snapshot, and suspend')
+baremetal_introspection_group = cfg.OptGroup(
+ name="baremetal_introspection",
+ title="Baremetal introspection service options",
+ help="When enabling baremetal introspection tests,"
+ "Ironic must be configured.")
+
baremetal_features_group = cfg.OptGroup(
name='baremetal_feature_enabled',
title="Enabled Baremetal Service Features")
@@ -114,3 +124,45 @@
default=True,
help="Defines if IPXE is enabled"),
]
+
+BaremetalIntrospectionGroup = [
+ cfg.StrOpt('catalog_type',
+ default='baremetal-introspection',
+ help="Catalog type of the baremetal provisioning service"),
+ cfg.StrOpt('endpoint_type',
+ default='publicURL',
+ choices=['public', 'admin', 'internal',
+ 'publicURL', 'adminURL', 'internalURL'],
+ help="The endpoint type to use for the baremetal introspection"
+ " service"),
+ cfg.IntOpt('introspection_sleep',
+ default=30,
+ help="Introspection sleep before check status"),
+ cfg.IntOpt('introspection_timeout',
+ default=600,
+ help="Introspection time out"),
+ cfg.IntOpt('hypervisor_update_sleep',
+ default=60,
+ help="Time to wait until nova becomes aware of "
+ "bare metal instances"),
+ cfg.IntOpt('hypervisor_update_timeout',
+ default=300,
+ help="Time out for wait until nova becomes aware of "
+ "bare metal instances"),
+ # NOTE(aarefiev): status_check_period default is 60s, but checking
+ # node state takes some time(API call), so races appear here,
+ # 80s would be enough to make one more check.
+ cfg.IntOpt('ironic_sync_timeout',
+ default=80,
+ help="Time it might take for Ironic--Inspector "
+ "sync to happen"),
+ cfg.IntOpt('discovery_timeout',
+ default=300,
+ help="Time to wait until new node would enrolled in "
+ "ironic"),
+ cfg.BoolOpt('auto_discovery_feature',
+ default=False,
+ help="Is the auto-discovery feature enabled. Enroll hook "
+ "should be specified in node_not_found_hook - processing "
+ "section of inspector.conf"),
+]