Merge lp:~evilnick/maas/cli-help into lp:~maas-committers/maas/trunk

[Nick Veitch]

Added minimum data requirements to help for maas-cli nodes new command

adds a little more explanation to the maas-cli nodes new commandline help

[Julian Edwards (julian-edwards)]

Looks good. Can you merge this into lp:maas/1.2 as well please!

review: Approve

[Nick Veitch (evilnick)]

On 06/11/12 04:26, Julian Edwards wrote:
> Review: Approve
>
> Looks good. Can you merge this into lp:maas/1.2 as well please!
arr

--
Nick Veitch,
Technical Writer, Cloud Engineering, Canonical
https://launchpad.net/~evilnick

[MAAS Lander (maas-lander)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-trunk/55/console reported an error when processing this lp:~evilnick/maas/cli-help branch.
Not merging it.

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-11-01 11:45:29 +0000
+++ src/maasserver/api.py	2012-11-05 14:18:25 +0000
@@ -745,6 +745,9 @@
 
         When a node has been added to MAAS by an admin MAAS user, it is
         ready for allocation to services running on the MAAS.
+        The minimum data required is:
+        architecture=<arch string> (e.g "i386/generic")
+        mac_address=<value>
         """
         node = create_node(request)
         if request.user.is_superuser: