← Back to branch summary

~ubuntu-branches/ubuntu/utopic/maas/utopic-security

« back to all changes in this revision

Viewing changes to src/provisioningserver/testing/boot_images.py

  • Committer: Package Import Robot
  • Author(s): Julian Edwards, Julian Edwards, Andres Rodriguez
  • Date: 2014-08-21 18:38:27 UTC
  • mfrom: (1.2.34)
  • Revision ID: package-import@ubuntu.com-20140821183827-9xyb5u2o4l8g3zxj
Tags: 1.6.1+bzr2550-0ubuntu1
https://launchpad.net/bugs/1341619
* New upstream bugfix release:
  - Auto-link node MACs to Networks (LP: #1341619)

[ Julian Edwards ]
* debian/maas-region-controller.postinst: Don't restart RabbitMQ on
  upgrades, just ensure it's running.  Should prevent a race with the
  cluster celery restarting.
* debian/rules: Pull upstream branch from the right place.

[ Andres Rodriguez ]
* debian/maas-region-controller.postinst: Ensure cluster celery is
  started if it also runs on the region.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/testing/boot_images.py
23
23
    """Create an arbitrary dict of boot-image parameters.
24
24
 
25
25
    These are the parameters that together describe a kind of boot for
26
 
    which we may need a kernel and initrd: architecture,
 
26
    which we may need a kernel and initrd: operating system, architecture,
27
27
    sub-architecture, Ubuntu release, boot purpose, and release label.
28
28
    """
29
29
    return dict(
 
30
        osystem=factory.make_name('osystem'),
30
31
        architecture=factory.make_name('architecture'),
31
32
        subarchitecture=factory.make_name('subarchitecture'),
32
33
        release=factory.make_name('release'),
33
34
        label=factory.make_name('label'),
34
35
        purpose=factory.make_name('purpose'),
 
36
        supported_subarches=factory.make_name("sup_subarches"),
35
37
        )
36
38
 
37
39
 
39
41
    """Create a dict of boot-image parameters as used to store the image.
40
42
 
41
43
    These are the parameters that together describe a path to store a boot
42
 
    image: architecture, sub-architecture, Ubuntu release, and release label.
 
44
    image: operating system, architecture, sub-architecture, Ubuntu release,
 
45
    and release label.
43
46
    """
44
47
    return dict(
 
48
        osystem=factory.make_name('osystem'),
45
49
        architecture=factory.make_name('architecture'),
46
50
        subarchitecture=factory.make_name('subarchitecture'),
47
51
        release=factory.make_name('release'),