Merge "conf: Remove cells v1 options, group"

Author: Zuul

nova/cmd/network.py

@@ -40,7 +40,10 @@ def main():
     config.parse_args(sys.argv)
     logging.setup(CONF, "nova")
 
-    if not CONF.cells.enable:
+    # NOTE(stephenfin): Yes, this is silly, but the whole thing is being
+    # removed and we want to make the diff in individual changes as small as
+    # possible
+    if True:
         LOG.error('Nova network is deprecated and not supported '
                   'except as required for CellsV1 deployments.')
         return 1

nova/conf/__init__.py

@@ -23,7 +23,6 @@
 from nova.conf import availability_zone
 from nova.conf import base
 from nova.conf import cache
-from nova.conf import cells
 from nova.conf import cinder
 from nova.conf import compute
 from nova.conf import conductor
@@ -77,7 +76,6 @@
 availability_zone.register_opts(CONF)
 base.register_opts(CONF)
 cache.register_opts(CONF)
-cells.register_opts(CONF)
 cinder.register_opts(CONF)
 compute.register_opts(CONF)
 conductor.register_opts(CONF)