Merge "Explore config options to oslo-config-generator"

ironic_lib/disk_partitioner.py

@@ -175,3 +175,8 @@ class DiskPartitioner(object):
                       'exited with "%(fuser_err)s". Time out waiting for '
                       'completion.')
                     % {'device': self._device, 'fuser_err': fuser_err[0]})
+
+
+def list_opts():
+    """Entry point for oslo-config-generator."""
+    return [('disk_partitioner', opts)]

ironic_lib/disk_utils.py

@@ -513,3 +513,8 @@ def work_on_disk(dev, root_mb, swap_mb, ephemeral_mb, ephemeral_format,
             LOG.error(_LE("Failed to detect %s"), part)
 
     return uuids_to_return
+
+
+def list_opts():
+    """Entry point for oslo-config-generator."""
+    return [('disk_utils', opts)]

ironic_lib/utils.py

@@ -143,3 +143,8 @@ def dd(src, dst, *args):
 def is_http_url(url):
     url = url.lower()
     return url.startswith('http://') or url.startswith('https://')
+
+
+def list_opts():
+    """Entry point for oslo-config-generator."""
+    return [('ironic_lib', utils_opts)]

setup.cfg

@@ -19,3 +19,9 @@ classifier =
 [files]
 packages =
     ironic_lib
+
+[entry_points]
+oslo.config.opts =
+    ironic_lib.disk_partitioner = ironic_lib.disk_partitioner:list_opts
+    ironic_lib.disk_utils = ironic_lib.disk_utils:list_opts
+    ironic_lib.utils = ironic_lib.utils:list_opts