Centralize config options - [irmc]

Nova style refactor of config options in Ironic.

Change-Id: Ia5d4e49c0a8d2de47d34ef9f0b4dfa740c500efa
Partial-Bug: #1561100

1 files changed, 1 insertions, 28 deletions

diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py
index 0c39d7bb6..c4bc59473 100644
--- a/ironic/drivers/modules/irmc/boot.py
+++ b/ironic/drivers/modules/irmc/boot.py
@@ -21,7 +21,6 @@ import shutil
 import tempfile
 
 from ironic_lib import utils as ironic_utils
-from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils
 
@@ -34,6 +33,7 @@ from ironic.common.i18n import _LI
 from ironic.common import images
 from ironic.common import states
 from ironic.conductor import utils as manager_utils
+from ironic.conf import CONF
 from ironic.drivers import base
 from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules.irmc import common as irmc_common
@@ -41,39 +41,12 @@ from ironic.drivers.modules.irmc import common as irmc_common
 
 scci = importutils.try_import('scciclient.irmc.scci')
 
-CONF = cfg.CONF
-
 try:
     if CONF.debug:
         scci.DEBUG = True
 except Exception:
     pass
 
-opts = [
-    cfg.StrOpt('remote_image_share_root',
-               default='/remote_image_share_root',
-               help=_('Ironic conductor node\'s "NFS" or "CIFS" root path')),
-    cfg.StrOpt('remote_image_server',
-               help=_('IP of remote image server')),
-    cfg.StrOpt('remote_image_share_type',
-               default='CIFS',
-               choices=['CIFS', 'NFS'],
-               ignore_case=True,
-               help=_('Share type of virtual media')),
-    cfg.StrOpt('remote_image_share_name',
-               default='share',
-               help=_('share name of remote_image_server')),
-    cfg.StrOpt('remote_image_user_name',
-               help=_('User name of remote_image_server')),
-    cfg.StrOpt('remote_image_user_password', secret=True,
-               help=_('Password of remote_image_user_name')),
-    cfg.StrOpt('remote_image_user_domain',
-               default='',
-               help=_('Domain name of remote_image_user_name')),
-]
-
-CONF.register_opts(opts, group='irmc')
-
 LOG = logging.getLogger(__name__)
 
 REQUIRED_PROPERTIES = {