Merge lp:~rvb/maas/enlistment-user-data into lp:~maas-committers/maas/trunk
Proposed by
Raphaël Badin
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raphaël Badin | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1383 | ||||
Proposed branch: | lp:~rvb/maas/enlistment-user-data | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
60 lines (+23/-3) 2 files modified
src/metadataserver/api.py (+3/-1) src/metadataserver/tests/test_api.py (+20/-2) |
||||
To merge this branch: | bzr merge lp:~rvb/maas/enlistment-user-data | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+136670@code.launchpad.net |
Commit message
Fix the enlistment user data: use the maas_url stored on the related nodegroup.
To post a comment you must log in.
Looks good.
[1]
+ ng_url = 'http:// %s' % factory. make_name( 'host') 'enlist- metadata- user-data' , args=['latest'])
...
+ ud_url = reverse(
I'm running a bit slow today, but it took me a while to figure out
what the prefixes ng and ud here meant.
[2]
+ MatchesAll( *[Contains( ng_url) , Not(Contains( maas_url) )]))
Or:
?