Centralize Config Options - patch merge, cleanup

Nova style refactor of config options in Ironic.

- Merge cimc, cisco_ucs options into one file: conf/cisco_ucs.py
- Remove unnecessary import_opts
- Move [amt] group options to conf/amt.py
- Renamed conf/cisco_ucs.py as conf/cisco.py
- Removed netconf.py.

Change-Id: I3c3f5d21de26a9d23ce766c24674f09999f610f5
Closes-Bug: #1561100

1 files changed, 1 insertions, 23 deletions

diff --git a/ironic/drivers/modules/amt/common.py b/ironic/drivers/modules/amt/common.py
index 831c1b0b3..a5274c36a 100644
--- a/ironic/drivers/modules/amt/common.py
+++ b/ironic/drivers/modules/amt/common.py
@@ -17,7 +17,6 @@ import time
 from xml import etree
 
 from oslo_concurrency import processutils
-from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils
 import six
@@ -27,6 +26,7 @@ from ironic.common import exception
 from ironic.common.i18n import _
 from ironic.common.i18n import _LE
 from ironic.common import utils
+from ironic.conf import CONF
 
 
 pywsman = importutils.try_import('pywsman')
@@ -47,28 +47,6 @@ OPTIONAL_PROPERTIES = {
 COMMON_PROPERTIES = REQUIRED_PROPERTIES.copy()
 COMMON_PROPERTIES.update(OPTIONAL_PROPERTIES)
 
-opts = [
-    cfg.StrOpt('protocol',
-               default='http',
-               choices=['http', 'https'],
-               help=_('Protocol used for AMT endpoint')),
-    cfg.IntOpt('awake_interval',
-               default=60,
-               min=0,
-               help=_('Time interval (in seconds) for successive awake call '
-                      'to AMT interface, this depends on the IdleTimeout '
-                      'setting on AMT interface. AMT Interface will go to '
-                      'sleep after 60 seconds of inactivity by default. '
-                      'IdleTimeout=0 means AMT will not go to sleep at all. '
-                      'Setting awake_interval=0 will disable awake call.')),
-]
-
-CONF = cfg.CONF
-opt_group = cfg.OptGroup(name='amt',
-                         title='Options for the AMT power driver')
-CONF.register_group(opt_group)
-CONF.register_opts(opts, opt_group)
-
 # TODO(lintan): More boot devices are supported by AMT, but not useful
 # currently. Add them in the future.
 BOOT_DEVICES_MAPPING = {