← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/disk/mount/api.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-02-22 09:27:29 UTC
  • mfrom: (1.1.68)
  • Revision ID: package-import@ubuntu.com-20130222092729-nn3gt8rf97uvts77
Tags: 2013.1.g3-0ubuntu1
https://launchpad.net/bugs/1110567
[ Chuck Short ]
* New usptream release. 
* debian/patches/debian/patches/fix-ubuntu-tests.patch: Refreshed.
* debian/nova-baremetal.logrotate: Fix logfile path.
* debian/control, debian/nova-spiceproxy.{install, logrotate, upstart}:
  Add spice html5 proxy support.
* debian/nova-novncproxy.upstart: Start on runlevel [2345]
* debian/rules: Call testr directly since run_tests.sh -N gives weird return
  value when tests pass.
* debian/pyddist-overrides: Add websockify.
* debian/nova-common.postinst: Removed config file conversion, since
  the option is no longer available. (LP: #1110567)
* debian/control: Add python-pyasn1 as a dependency.
* debian/control: Add python-oslo-config as a dependency.
* debian/control: Suggest sysfsutils, sg3-utils, multipath-tools for fibre
  channel support.

[ Adam Gandelman ]
* debian/control: Fix typo (websocikfy -> websockify).

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/disk/mount/api.py
13
13
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14
14
# License for the specific language governing permissions and limitations
15
15
# under the License.
16
 
"""Support for mounting virtual image files"""
 
16
"""Support for mounting virtual image files."""
17
17
 
18
18
import os
19
19
import time
211
211
        finally:
212
212
            if not status:
213
213
                LOG.debug(_("Fail to mount, tearing back down"))
214
 
                self.do_umount()
 
214
                self.do_teardown()
215
215
        return status
216
216
 
217
217
    def do_umount(self):
218
 
        """Call the unmnt, unmap and unget operations."""
 
218
        """Call the unmnt operation."""
 
219
        if self.mounted:
 
220
            self.unmnt_dev()
 
221
 
 
222
    def do_teardown(self):
 
223
        """Call the umnt, unmap, and unget operations."""
219
224
        if self.mounted:
220
225
            self.unmnt_dev()
221
226
        if self.mapped: