← Back to branch summary

~ubuntu-branches/ubuntu/trusty/maas/trusty-security

« back to all changes in this revision

Viewing changes to src/provisioningserver/tasks.py

  • Committer: Package Import Robot
  • Author(s): Greg Lutostanski
  • Date: 2014-08-29 13:27:34 UTC
  • mto: (61.1.4 trusty-proposed)
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: package-import@ubuntu.com-20140829132734-d47evihju2etdwcy
Tags: upstream-1.5.4+bzr2294
Import upstream version 1.5.4+bzr2294

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/tasks.py
58
58
    set_up_options_conf,
59
59
    setup_rndc,
60
60
    )
 
61
from provisioningserver.drivers.hardware.mscm import probe_and_enlist_mscm
61
62
from provisioningserver.omshell import Omshell
62
63
from provisioningserver.power.poweraction import (
63
64
    PowerAction,
493
494
@task
494
495
@log_exception_text
495
496
def enlist_nodes_from_ucsm(url, username, password):
496
 
    """ See `maasserver.api.NodeGroupsHandler.enlist_nodes_from_ucsm`. """
 
497
    """ See `maasserver.api.NodeGroupHandler.enlist_nodes_from_ucsm`. """
497
498
    probe_and_enlist_ucsm(url, username, password)
 
499
 
 
500
 
 
501
@task
 
502
@log_exception_text
 
503
def enlist_nodes_from_mscm(host, username, password):
 
504
    """ See `maasserver.api.NodeGroupHandler.enlist_nodes_from_mscm`. """
 
505
    probe_and_enlist_mscm(host, username, password)