← Back to branch summary

~ubuntu-branches/ubuntu/raring/maas/raring-updates

« back to all changes in this revision

Viewing changes to src/maasserver/provisioning.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-07-03 17:42:37 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20120703174237-p8l0keuuznfg721k
Tags: 0.1+bzr709+dfsg-0ubuntu1
* New Upstream release
* debian/control:
  - Depends on python-celery, python-tempita, libjs-yui3-{full,min},
    libjs-raphael
* debian/maas.install:
  - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2.
  - Update to install various files from chroot, rather tha manually copy
    them from the source.
* debian/maas.links: symlink celeryconfig.py
* debian/maas.maas-celery.upstart: Add job.
* debian/rules:
  - Install celery upstart job.
  - Do not install jslibs as packages are now used.
  - Drop copying of maas_local_settings_sample.py as source now ships
    a maas_local_settings.py
* debian/patches:
  - 04-maas-http-fix.patch: Drop. Merged upstream.
  - 01-fix-database-settings.patch: Refreshed.
  - 99_enums_js.patch: Added until creation of enum.js / build process
    is fixed.
* debian/maas.postinst: Update bzr version to correctly handle upgrades.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/provisioning.py
38
38
    discard_persistent_error,
39
39
    register_persistent_error,
40
40
    )
 
41
from maasserver.enum import (
 
42
    ARCHITECTURE_CHOICES,
 
43
    NODE_STATUS,
 
44
    )
41
45
from maasserver.exceptions import ExternalComponentException
42
46
from maasserver.models import (
43
 
    ARCHITECTURE_CHOICES,
44
47
    Config,
45
48
    MACAddress,
46
49
    Node,
47
 
    NODE_STATUS,
48
50
    )
49
51
from provisioningserver.enum import PSERV_FAULT
50
52
import yaml
366
368
 
367
369
def compose_commissioning_preseed(token):
368
370
    """Compose the preseed value for a Commissioning node."""
369
 
    return "#cloud-config\n%s" % yaml.dump({
 
371
    return "#cloud-config\n%s" % yaml.safe_dump({
370
372
        'datasource': {
371
373
            'MAAS': {
372
374
                'metadata_url': get_metadata_server_url(),