summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nova/cmd/cells.py49
-rw-r--r--nova/service.py1
-rw-r--r--releasenotes/notes/remove-cells-v1-055028c270d06680.yaml5
-rw-r--r--setup.cfg1
4 files changed, 5 insertions, 51 deletions
diff --git a/nova/cmd/cells.py b/nova/cmd/cells.py
deleted file mode 100644
index 87734babef..0000000000
--- a/nova/cmd/cells.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2012 Rackspace Hosting
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-"""Starter script for Nova Cells Service."""
-
-import sys
-
-from oslo_log import log as logging
-from oslo_reports import guru_meditation_report as gmr
-from oslo_reports import opts as gmr_opts
-
-from nova import cells
-import nova.conf
-from nova import config
-from nova import objects
-from nova import service
-from nova import version
-
-CONF = nova.conf.CONF
-LOG = logging.getLogger('nova.cells')
-
-
-def main():
- config.parse_args(sys.argv)
- logging.setup(CONF, 'nova')
- objects.register_all()
- gmr_opts.set_defaults(CONF)
-
- gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
-
- LOG.warning('Cells v1 is deprecated in favor of Cells v2 and will be '
- 'removed in the future.')
- server = service.Service.create(binary='nova-cells',
- topic=cells.TOPIC,
- manager='nova.cells.manager.CellsManager')
- service.serve(server)
- service.wait()
diff --git a/nova/service.py b/nova/service.py
index b0655c0513..3fbdc0f90b 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -59,7 +59,6 @@ SERVICE_MANAGERS = {
'nova-conductor': 'nova.conductor.manager.ConductorManager',
'nova-metadata': 'nova.api.manager.MetadataManager',
'nova-scheduler': 'nova.scheduler.manager.SchedulerManager',
- 'nova-cells': 'nova.cells.manager.CellsManager',
}
diff --git a/releasenotes/notes/remove-cells-v1-055028c270d06680.yaml b/releasenotes/notes/remove-cells-v1-055028c270d06680.yaml
new file mode 100644
index 0000000000..165476f791
--- /dev/null
+++ b/releasenotes/notes/remove-cells-v1-055028c270d06680.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ The *cells v1* feature has been deprecated since the 16.0.0 Pike release
+ and has now been removed. The ``nova-cells`` service has been removed.
diff --git a/setup.cfg b/setup.cfg
index c881524ba0..b9481bc445 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -57,7 +57,6 @@ console_scripts =
nova-api = nova.cmd.api:main
nova-api-metadata = nova.cmd.api_metadata:main
nova-api-os-compute = nova.cmd.api_os_compute:main
- nova-cells = nova.cmd.cells:main
nova-compute = nova.cmd.compute:main
nova-conductor = nova.cmd.conductor:main
nova-console = nova.cmd.console:main