openstack/placement
Code Issues Proposed changes

Remove Deprecated EC2 and ObjectStore impl/tests

Browse Source 
In Id7936be290b6febd18deb4c2db8ea4d678d4d9b1, we removed
entries from api-paste.ini for EC2 API service. In this
review we remove all the unnecessary code, docs and tests
associated with objectstore and ec2 service. Note that this
does not cleanup the Instance object or change any of the
versioned objects. We just drop any code associated with
testing the REST endpoint(s) that are no longer needed.
Also added shims such that the api-paste.ini from liberty
will still work (grenade job) and added logs and response
messages for prompting administrators to cleanup their
old api-paste.ini and switching to the stand alone EC2 API
project for their needs.

Change-Id: I8bf7cbaa7015bb61656ab90ccc8f944aaeebb095
This commit is contained in:
Davanum Srinivas 2016-01-04 12:52:34 -05:00
parent 9e86e34815
commit bf1dc1017a
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/conf.py
View File

@ -111,8 +111,6 @@ modindex_common_prefix = ['nova.']
man_pages = [ man_pages = [
('man/nova-all', 'nova-all', u'Cloud controller fabric', ('man/nova-all', 'nova-all', u'Cloud controller fabric',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/nova-api-ec2', 'nova-api-ec2', u'Cloud controller fabric',
[u'OpenStack'], 1),
('man/nova-api-metadata', 'nova-api-metadata', u'Cloud controller fabric', ('man/nova-api-metadata', 'nova-api-metadata', u'Cloud controller fabric',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/nova-api-os-compute', 'nova-api-os-compute', ('man/nova-api-os-compute', 'nova-api-os-compute',
@ -143,8 +141,6 @@ man_pages = [
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/nova-serialproxy', 'nova-serialproxy', u'Cloud controller fabric', ('man/nova-serialproxy', 'nova-serialproxy', u'Cloud controller fabric',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/nova-objectstore', 'nova-objectstore', u'Cloud controller fabric',
[u'OpenStack'], 1),
('man/nova-rootwrap', 'nova-rootwrap', u'Cloud controller fabric', ('man/nova-rootwrap', 'nova-rootwrap', u'Cloud controller fabric',
[u'OpenStack'], 1), [u'OpenStack'], 1),
('man/nova-scheduler', 'nova-scheduler', u'Cloud controller fabric', ('man/nova-scheduler', 'nova-scheduler', u'Cloud controller fabric',

2
nova/tests/fixtures.py
View File

@ -342,10 +342,8 @@ class OSAPIFixture(fixtures.Fixture):
# in order to run these in tests we need to bind only to local # in order to run these in tests we need to bind only to local
# host, and dynamically allocate ports # host, and dynamically allocate ports
conf_overrides = { conf_overrides = {
'ec2_listen': '127.0.0.1',
'osapi_compute_listen': '127.0.0.1', 'osapi_compute_listen': '127.0.0.1',
'metadata_listen': '127.0.0.1', 'metadata_listen': '127.0.0.1',
'ec2_listen_port': 0,
'osapi_compute_listen_port': 0, 'osapi_compute_listen_port': 0,
'metadata_listen_port': 0, 'metadata_listen_port': 0,
'verbose': True, 'verbose': True,

1
nova/utils.py
View File

@ -67,7 +67,6 @@ monkey_patch_opts = [
help='Whether to apply monkey patching'), help='Whether to apply monkey patching'),
cfg.ListOpt('monkey_patch_modules', cfg.ListOpt('monkey_patch_modules',
default=[ default=[
'nova.api.ec2.cloud:%s' % (notify_decorator),
'nova.compute.api:%s' % (notify_decorator) 'nova.compute.api:%s' % (notify_decorator)
], ],
help='List of modules/decorators to monkey patch'), help='List of modules/decorators to monkey patch'),

1
setup.cfg
View File

@ -58,7 +58,6 @@ console_scripts =
nova-manage = nova.cmd.manage:main nova-manage = nova.cmd.manage:main
nova-network = nova.cmd.network:main nova-network = nova.cmd.network:main
nova-novncproxy = nova.cmd.novncproxy:main nova-novncproxy = nova.cmd.novncproxy:main
nova-objectstore = nova.cmd.objectstore:main
nova-rootwrap = oslo_rootwrap.cmd:main nova-rootwrap = oslo_rootwrap.cmd:main
nova-rootwrap-daemon = oslo_rootwrap.cmd:daemon nova-rootwrap-daemon = oslo_rootwrap.cmd:daemon
nova-scheduler = nova.cmd.scheduler:main nova-scheduler = nova.cmd.scheduler:main