← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/image/fake.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Chuck Short, Soren Hansen
  • Date: 2011-04-08 10:49:10 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20110408104910-syd12xtg27bdqbun
Tags: 2011.2~gamma1-0ubuntu1
[Chuck Short]
* New upstream release.
* debian/nova-doc.docs: Adjust directory to the right docs path.

[Soren Hansen]
* Refresh nova-manage-flags patch.
* Adjust call to ajaxterm to work with the packaged ajaxterm instead
  of the one we ship in the tarball.
* Remove all traces of the adminclient package. It moved to its own
  tarball. There are no known consumers, so this should not be a
  problem.
* Remove build-dependency on python-suds again.
* setup.py now takes care of installing the CA code, so yank those
  bits from debian/nova-common.install.
* setup.py now places api-paste.ini correctly, so stop working around
  it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/image/fake.py
44
44
                 'created_at': timestamp,
45
45
                 'updated_at': timestamp,
46
46
                 'status': 'active',
47
 
                 'type': 'machine',
 
47
                 'container_format': 'ami',
 
48
                 'disk_format': 'raw',
48
49
                 'properties': {'kernel_id': FLAGS.null_kernel,
49
 
                                'ramdisk_id': FLAGS.null_kernel,
50
 
                                'disk_format': 'ami'}
 
50
                                'ramdisk_id': FLAGS.null_kernel}
51
51
                }
52
52
        self.create(None, image)
53
53
        super(FakeImageService, self).__init__()