Merge branch '2.8' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.8

This commit is contained in:
lissav 2014-02-25 11:41:45 -05:00
commit 84232a4b45

View File

@ -72,8 +72,8 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
:param block_device_info: Information about block devices to be
attached to the instance.
"""
import pdb
pdb.set_trace()
#import pdb
#pdb.set_trace()
node_uuid = self._require_node(instance)
node = db.bm_node_associate_and_update(context, node_uuid,
{'instance_uuid': instance['uuid'],
@ -166,8 +166,8 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
be detached from the instance.
:param destroy_disks: Indicates if disks should be destroyed
"""
#import pdb
#pdb.set_trace()
#import pdb
#pdb.set_trace()
try:
node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid'])