Skip to content

Commit 10bbe6b

Browse files
committed
conf: Remove cells v1 options, group
This is no longer used anywhere and can therefore be safely removed. Part of blueprint remove-cells-v1 Change-Id: I16b6d428accabf9dd7692909084faaf426e13524 Signed-off-by: Stephen Finucane <[email protected]>
1 parent dbc5dfa commit 10bbe6b

File tree

6 files changed

+37
-608
lines changed

6 files changed

+37
-608
lines changed

nova/cmd/network.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ def main():
4040
config.parse_args(sys.argv)
4141
logging.setup(CONF, "nova")
4242

43-
if not CONF.cells.enable:
43+
# NOTE(stephenfin): Yes, this is silly, but the whole thing is being
44+
# removed and we want to make the diff in individual changes as small as
45+
# possible
46+
if True:
4447
LOG.error('Nova network is deprecated and not supported '
4548
'except as required for CellsV1 deployments.')
4649
return 1

nova/conf/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from nova.conf import availability_zone
2424
from nova.conf import base
2525
from nova.conf import cache
26-
from nova.conf import cells
2726
from nova.conf import cinder
2827
from nova.conf import compute
2928
from nova.conf import conductor
@@ -77,7 +76,6 @@
7776
availability_zone.register_opts(CONF)
7877
base.register_opts(CONF)
7978
cache.register_opts(CONF)
80-
cells.register_opts(CONF)
8179
cinder.register_opts(CONF)
8280
compute.register_opts(CONF)
8381
conductor.register_opts(CONF)

0 commit comments

Comments
 (0)