← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/virt/vmwareapi/io_util.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/vmwareapi/io_util.py
96
96
                    # If the state is killed, then raise an exception.
97
97
                    elif image_status == "killed":
98
98
                        self.stop()
99
 
                        exc_msg = (_("Glance image %s is in killed state") %
100
 
                                   self.image_id)
101
 
                        LOG.error(exc_msg)
102
 
                        self.done.send_exception(exception.Error(exc_msg))
 
99
                        msg = (_("Glance image %s is in killed state") %
 
100
                                 self.image_id)
 
101
                        LOG.error(msg)
 
102
                        self.done.send_exception(exception.NovaException(msg))
103
103
                    elif image_status in ["saving", "queued"]:
104
104
                        greenthread.sleep(GLANCE_POLL_INTERVAL)
105
105
                    else:
106
106
                        self.stop()
107
 
                        exc_msg = _("Glance image "
 
107
                        msg = _("Glance image "
108
108
                                    "%(image_id)s is in unknown state "
109
109
                                    "- %(state)s") % {
110
110
                                            "image_id": self.image_id,
111
111
                                            "state": image_status}
112
 
                        LOG.error(exc_msg)
113
 
                        self.done.send_exception(exception.Error(exc_msg))
 
112
                        LOG.error(msg)
 
113
                        self.done.send_exception(exception.NovaException(msg))
114
114
                except Exception, exc:
115
115
                    self.stop()
116
116
                    self.done.send_exception(exc)