← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/volume/driver.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/volume/driver.py
268
268
                                                           volume['id'])
269
269
        except exception.NotFound:
270
270
            LOG.info(_("Skipping ensure_export. No iscsi_target "
271
 
                       "provisioned for volume: %d"), volume['id'])
 
271
                       "provisioned for volume: %s"), volume['id'])
272
272
            return
273
273
 
274
274
        iscsi_name = "%s%s" % (FLAGS.iscsi_target_prefix, volume['name'])
316
316
                                                           volume['id'])
317
317
        except exception.NotFound:
318
318
            LOG.info(_("Skipping remove_export. No iscsi_target "
319
 
                       "provisioned for volume: %d"), volume['id'])
 
319
                       "provisioned for volume: %s"), volume['id'])
320
320
            return
321
321
 
322
322
        try:
325
325
            self.tgtadm.show_target(iscsi_target)
326
326
        except Exception as e:
327
327
            LOG.info(_("Skipping remove_export. No iscsi_target "
328
 
                       "is presently exported for volume: %d"), volume['id'])
 
328
                       "is presently exported for volume: %s"), volume['id'])
329
329
            return
330
330
 
331
331
        self.tgtadm.delete_logicalunit(iscsi_target, 0)