← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Soren Hansen
  • Date: 2012-09-07 17:49:53 UTC
  • mfrom: (1.1.61)
  • Revision ID: package-import@ubuntu.com-20120907174953-oapuvix1jxm830he
Tags: 2012.2~rc1~20120907.15996-0ubuntu1
https://launchpad.net/bugs/995285
[ Chuck Short ]
* New upstream release.
* debian/nova-common.postinst: Drop nova_sudoers permission changing
  since we do it in the debian/rules. (LP: #995285)

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* Fix Launchpad URLs in debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/vmwareapi/driver.py
126
126
        """List VM instances."""
127
127
        return self._vmops.list_instances()
128
128
 
129
 
    def spawn(self, context, instance, image_meta, network_info,
130
 
              block_device_mapping=None):
 
129
    def spawn(self, context, instance, image_meta, injected_files,
 
130
              admin_password, network_info=None, block_device_info=None):
131
131
        """Create VM instance."""
132
132
        self._vmops.spawn(context, instance, image_meta, network_info)
133
133