From dbf0b2c8ae1334ee125f66aa6ed9ccb8303f42ca Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 17 Nov 2016 11:46:13 -0500 Subject: [PATCH] Revert "Make n-net refuse to start unless using CellsV1" This reverts commit c07046edeee562142c90aa3cadd4bdc47b0a15da. Trove's CI jobs don't currently work with Neutron due to bug 1629133 so this is a temporary revert until the Trove CI/infra networking situation gets sorted out. We have agreement from the Trove PTL to revert this revert after the o-2 milestone on 2016/12/15. Change-Id: Ia4fc545a10c7c16532aefd73818dd7d90c9c271b Related-Bug: #1629133 --- nova/cmd/network.py | 8 +------- nova/tests/unit/cmd/test_cmd_db_blocks.py | 1 - .../nova-network-only-for-cellsv1-dfb72fb1d3339bb3.yaml | 6 ------ 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 releasenotes/notes/nova-network-only-for-cellsv1-dfb72fb1d3339bb3.yaml diff --git a/nova/cmd/network.py b/nova/cmd/network.py index 7b57c7e1c8..0e1733dda4 100644 --- a/nova/cmd/network.py +++ b/nova/cmd/network.py @@ -25,7 +25,7 @@ from nova.cmd import common as cmd_common from nova.conductor import rpcapi as conductor_rpcapi import nova.conf from nova import config -from nova.i18n import _LE, _LW +from nova.i18n import _LW from nova import objects from nova.objects import base as objects_base from nova import service @@ -39,12 +39,6 @@ LOG = logging.getLogger('nova.network') def main(): config.parse_args(sys.argv) logging.setup(CONF, "nova") - - if not CONF.cells.enable: - LOG.error(_LE('Nova network is deprecated and not supported ' - 'except as required for CellsV1 deployments.')) - return 1 - utils.monkey_patch() objects.register_all() diff --git a/nova/tests/unit/cmd/test_cmd_db_blocks.py b/nova/tests/unit/cmd/test_cmd_db_blocks.py index 80ad457354..98d812f1b9 100644 --- a/nova/tests/unit/cmd/test_cmd_db_blocks.py +++ b/nova/tests/unit/cmd/test_cmd_db_blocks.py @@ -51,7 +51,6 @@ class ComputeMainTest(test.NoDBTestCase): db.api.instance_get, 1, 2) def test_network_main_blocks_db(self): - self.flags(enable=True, group='cells') with restore_db(): self._call_main(network) self.assertRaises(exception.DBNotAllowed, diff --git a/releasenotes/notes/nova-network-only-for-cellsv1-dfb72fb1d3339bb3.yaml b/releasenotes/notes/nova-network-only-for-cellsv1-dfb72fb1d3339bb3.yaml deleted file mode 100644 index 8a449cc0ed..0000000000 --- a/releasenotes/notes/nova-network-only-for-cellsv1-dfb72fb1d3339bb3.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -deprecations: - - Nova network was deprecated in Newton and is no longer - supported for regular deployments in Ocata. The network - service binary will now refuse to start, except in the special - case of CellsV1 where it is still required to function. \ No newline at end of file