From da51a34f7b661bc22cb2aa9fa4af0ccf7d715b0d Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 29 Nov 2019 13:47:04 +0000 Subject: [PATCH] nova-net: Remove 'MetadataManager' This was only applying some iptables rules when running under nova-network. Since that's no longer possible, we don't need to keep the manager around. So don't! Change-Id: I4350b6f3ca3fd7de1bc6db3e14fe261f2746b002 Signed-off-by: Stephen Finucane --- nova/api/manager.py | 27 --------------------------- nova/service.py | 1 - nova/tests/unit/test_profiler.py | 1 - 3 files changed, 29 deletions(-) delete mode 100644 nova/api/manager.py diff --git a/nova/api/manager.py b/nova/api/manager.py deleted file mode 100644 index e9cc6823391a..000000000000 --- a/nova/api/manager.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# 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. - -from nova import manager - - -# TODO(stephenfin): Remove this as it's no longer necessary. -class MetadataManager(manager.Manager): - """Metadata Manager. - - This class manages the Metadata API service initialization. - """ - def __init__(self, *args, **kwargs): - super(MetadataManager, self).__init__(*args, **kwargs) diff --git a/nova/service.py b/nova/service.py index 24aa7332895a..2b903064cf19 100644 --- a/nova/service.py +++ b/nova/service.py @@ -55,7 +55,6 @@ CONF = nova.conf.CONF SERVICE_MANAGERS = { 'nova-compute': 'nova.compute.manager.ComputeManager', 'nova-conductor': 'nova.conductor.manager.ConductorManager', - 'nova-metadata': 'nova.api.manager.MetadataManager', 'nova-scheduler': 'nova.scheduler.manager.SchedulerManager', } diff --git a/nova/tests/unit/test_profiler.py b/nova/tests/unit/test_profiler.py index 2cef753b7c48..7b5e64dad6f4 100644 --- a/nova/tests/unit/test_profiler.py +++ b/nova/tests/unit/test_profiler.py @@ -47,7 +47,6 @@ class TestProfiler(test.NoDBTestCase): six.reload_module(importutils.import_module('nova.manager')) classes = [ - 'nova.api.manager.MetadataManager', 'nova.compute.api.API', 'nova.compute.manager.ComputeManager', 'nova.compute.rpcapi.ComputeAPI',