openstack/nova
Code Issues Proposed changes

remove ec2 in service and cmd

Browse Source 
ec2 was deprecated in commit
f098398a83
back to mitaka release, this patch
starts to remove ec2 services in nova.

Change-Id: I5939ef73904f1bb66ed8453c900bfb50cdb5b8b6
This commit is contained in:
jichen 2018-03-27 16:22:19 +08:00
parent d20372445f
commit 6db94dae98
5 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/availability_zone.py
View File

@ -65,7 +65,7 @@ class AvailabilityZoneController(wsgi.Controller):
zone_hosts = {}
host_services = {}
api_services = ('nova-osapi_compute', 'nova-ec2', 'nova-metadata')
api_services = ('nova-osapi_compute', 'nova-metadata')
for service in enabled_services:
if service.binary in api_services:
# Skip API services in the listing since they are not

2
nova/api/openstack/compute/hosts.py
View File

@ -88,7 +88,7 @@ class HostController(wsgi.Controller):
services = self.api.service_get_all(context, filters=filters,
set_zones=True, all_cells=True)
hosts = []
api_services = ('nova-osapi_compute', 'nova-ec2', 'nova-metadata')
api_services = ('nova-osapi_compute', 'nova-metadata')
for service in services:
if service.binary not in api_services:
hosts.append({'host_name': service['host'],

2
nova/api/openstack/compute/services.py
View File

@ -45,7 +45,7 @@ class ServiceController(wsgi.Controller):
# The API services are filtered out since they are not RPC services
# and therefore their state is not reported through the service group
# API, so they would always be reported as 'down' (see bug 1543625).
api_services = ('nova-osapi_compute', 'nova-ec2', 'nova-metadata')
api_services = ('nova-osapi_compute', 'nova-metadata')
context = req.environ['nova.context']
context.can(services_policies.BASE_POLICY_NAME)

11
nova/cmd/manage.py
View File

@ -44,7 +44,6 @@ import six
import six.moves.urllib.parse as urlparse
from sqlalchemy.engine import url as sqla_url
from nova.api.ec2 import ec2utils
from nova.cmd import common as cmd_common
import nova.conf
from nova import config
@ -83,16 +82,6 @@ args = cmd_common.args
action_description = cmd_common.action_description
def param2id(object_id):
"""Helper function to convert various volume id types to internal id.
args: [object_id], e.g. 'vol-0000000a' or 'volume-0000000a' or '10'
"""
if '-' in object_id:
return ec2utils.ec2_vol_id_to_uuid(object_id)
else:
return object_id
def mask_passwd_in_url(url):
parsed = urlparse.urlparse(url)
safe_netloc = re.sub(':.*@', ':****@', parsed.netloc)

2
nova/service.py
View File

@ -322,7 +322,7 @@ class WSGIService(service.Service):
"""
self.name = name
# NOTE(danms): Name can be metadata, osapi_compute, or ec2, per
# NOTE(danms): Name can be metadata, osapi_compute, per
# nova.service's enabled_apis
self.binary = 'nova-%s' % name
self.topic = None