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 <sfinucan@redhat.com>

nova/api/manager.py

@@ -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)

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',
 }
 

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',