← Back to branch summary

~lamont/maas/bug-1645912-2.1

« back to all changes in this revision

Viewing changes to src/maasserver/provisioning.py

  • Committer: Raphael Badin
  • Date: 2012-03-01 16:23:38 UTC
  • mto: This revision was merged to the branch mainline in revision 206.
  • Revision ID: raphael.badin@canonical.com-20120301162338-zfo0twouih7znr7q
Fix settings, add packaging template file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/provisioning.py
28
28
    MACAddress,
29
29
    Node,
30
30
    )
31
 
from metadataserver.models import NodeKey
32
31
 
33
32
 
34
33
def get_provisioning_api_proxy():
68
67
    :return: A dict containing metadata information that will be seeded to
69
68
        the node, so that it can access the metadata service.
70
69
    """
 
70
    # Circular import.
 
71
    from metadataserver.models import NodeKey
71
72
    token = NodeKey.objects.get_token_for_node(node)
72
73
    credentials = urlencode({
73
74
        'oauth_consumer_key': token.consumer.key,