Merge "Use correct arugment for nova restore"

This commit is contained in:
Jenkins 2017-02-15 17:30:43 +00:00 committed by Gerrit Code Review
commit 2be2fb4a34
1 changed files with 2 additions and 2 deletions

View File

@ -296,9 +296,9 @@ class RestoreJob(Job):
LOG.info("Restoring nova backup. Instance ID: {0}, timestamp: {1} " LOG.info("Restoring nova backup. Instance ID: {0}, timestamp: {1} "
"network-id {2}".format(conf.nova_inst_id, "network-id {2}".format(conf.nova_inst_id,
restore_timestamp, restore_timestamp,
conf.nova_network_id)) conf.nova_restore_network))
res.restore_nova(conf.nova_inst_id, restore_timestamp, res.restore_nova(conf.nova_inst_id, restore_timestamp,
conf.nova_network_id) conf.nova_restore_network)
elif conf.backup_media == 'cinder': elif conf.backup_media == 'cinder':
LOG.info("Restoring cinder backup from glance. Volume ID: {0}, " LOG.info("Restoring cinder backup from glance. Volume ID: {0}, "
"timestamp: {1}".format(conf.cinder_vol_id, "timestamp: {1}".format(conf.cinder_vol_id,