openstack/ironic
Code Issues Proposed changes

backport reviewer comments on nova.virt.ironic.patcher

Browse Source 
Backport comments on the Nova driver review in
https://review.openstack.org/#/c/111423/
to Ironic's tree.

Change-Id: If5939e3dcc3686046e0fc7989114d25270f034e8
This commit is contained in:
Devananda van der Veen 2014-08-07 14:09:08 -07:00
parent 55e2ea9fc1
commit 435c20bd01
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/nova/virt/ironic/patcher.py
View File

@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__)
def create(node):
"""Create an instance of the appropriate DriverFields class.
:param node: a dict containing an Ironic node
:param node: a node object returned from ironicclient
:returns: GenericDriverFields or a subclass thereof, as appropriate
for the supplied node.
"""
@ -64,14 +64,14 @@ class GenericDriverFields(object):
patch.append({'path': '/instance_info/image_source', 'op': 'add',
'value': image_meta['id']})
patch.append({'path': '/instance_info/root_gb', 'op': 'add',
'value': str(instance['root_gb'])})
'value': str(instance.root_gb)})
patch.append({'path': '/instance_info/swap_mb', 'op': 'add',
'value': str(flavor['swap'])})
if instance.get('ephemeral_gb'):
if instance.ephemeral_gb:
patch.append({'path': '/instance_info/ephemeral_gb',
'op': 'add',
'value': str(instance['ephemeral_gb'])})
'value': str(instance.ephemeral_gb)})
if CONF.default_ephemeral_format:
patch.append({'path': '/instance_info/ephemeral_format',
'op': 'add',