MAAS

Merge lp:~julian-edwards/maas/maas-enlist into lp:~maas-maintainers/maas/maas-enlist

  1. maas-enlist
  2. Merge into maas-enlist
Proposed by Julian Edwards
Status: Merged
Merged at revision: 37
Proposed branch: lp:~julian-edwards/maas/maas-enlist
Merge into: lp:~maas-maintainers/maas/maas-enlist
Diff against target: 11 lines (+1/-0)
1 file modified
bin/maas-enlist (+1/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/maas-enlist
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+205680@code.launchpad.net

Commit message

Ensure autodetect_nodegroup is passed to force detection of this node's nodegroup. Upcoming changes in the maas server require this because autodetection from non-node calls is nonsensical and wrong.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Oh FFS the bash script has TABS in it.

Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

If I were you I'd just follow up with a branch that got rid of the tabs.

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

I agree.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/maas-enlist'
2--- bin/maas-enlist 2012-10-10 21:22:39 +0000
3+++ bin/maas-enlist 2014-02-11 03:00:42 +0000
4@@ -92,6 +92,7 @@
5
6 curl \
7 --data-urlencode "op=new" \
8+ --data-urlencode "autodetect_nodegroup=1" \
9 --data-urlencode "hostname=${hostname}" \
10 --data-urlencode "architecture=${arch}" \
11 --data-urlencode "subarchitecture=${subarch}" \

Subscribers

People subscribed via source and target branches