openstack
/
nova
Code Issues Proposed changes

Merge "trivial: Remove dead code"

This commit is contained in:
Zuul 2019-04-08 18:13:01 +00:00 committed by Gerrit Code Review
parent 6587432640 ebb1f1abba
commit b77abff22d
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/api/metadata/base.py
View File

@ -281,18 +281,10 @@ class InstanceMetadata(object):
meta_data['public-hostname'] = hostname
meta_data['public-ipv4'] = floating_ip
if False and self._check_version('2007-03-01', version):
# TODO(vish): store product codes
meta_data['product-codes'] = []
if self._check_version('2007-08-29', version):
instance_type = self.instance.get_flavor()
meta_data['instance-type'] = instance_type['name']
if False and self._check_version('2007-10-10', version):
# TODO(vish): store ancestor ids
meta_data['ancestor-ami-ids'] = []
if self._check_version('2007-12-15', version):
meta_data['block-device-mapping'] = self.mappings
if self.instance.ec2_ids.kernel_id:

1
nova/conductor/manager.py
View File

@ -1137,7 +1137,6 @@ class ComputeTaskManager(base.Base):
"Either specify a different image during rebuild "
"or create a new server with the specified image "
"and a compatible flavor."))
return
# If image traits are present, then validate against allocations.
allocations = self.report_client.get_allocations_for_consumer(