x/powervc-driver
Code Issues Proposed changes

Remove configuration_data from instance.system_metadata before save

Browse Source 
For Activation Engine, instance would have a configuration_data in its
system metadata, powervc driver does not need this and before save nova
instance, we need to remove this system metdata. Otherwise db will not
throw exception.

Closes-Bug: #1410649
Change-Id: I3fef4ae8c2d99dc103164fa346a2424185e773f5
(cherry picked from commit a717ce4cec)
This commit is contained in:
terryyao
2015-01-26 14:58:34 +08:00
committed by Terry Yao
parent 4fcd0c76df
commit 49ed480765
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova-powervc/powervc/nova/driver/virt/powervc/driver.py
View File

@@ -324,6 +324,8 @@ class PowerVCDriver(driver.ComputeDriver):
if constants.PVC_ID in meta.keys(): if constants.PVC_ID in meta.keys():
del(meta[constants.PVC_ID]) del(meta[constants.PVC_ID])
instance['metadata'] = meta instance['metadata'] = meta
# remove activation engine configuration_data as db is not allowed
instance.system_metadata.pop('configuration_data', None)
instance.save() instance.save()
LOG.debug('Saved instance with clearing pvc_id in metadata during' LOG.debug('Saved instance with clearing pvc_id in metadata during'
'spawn failure: %s', instance) 'spawn failure: %s', instance)

2
nova-powervc/powervc/nova/driver/virt/powervc/service.py
View File

@@ -638,6 +638,8 @@ class PowerVCService(object):
orig_instance['architecture'] = constants.PPC64 orig_instance['architecture'] = constants.PPC64
orig_instance['power_state'] = powerstate orig_instance['power_state'] = powerstate
orig_instance['metadata'] = meta orig_instance['metadata'] = meta
# remove activation engine configuration data as db is not allowed
orig_instance.system_metadata.pop('configuration_data', None)
orig_instance.save() orig_instance.save()
LOG.debug('Saved instance after created PowerVC instance: %s', LOG.debug('Saved instance after created PowerVC instance: %s',
orig_instance) orig_instance)