Merge lp://qastaging/~jason-hobbs/maas/add-option-to-disable-dhclient-on-all-interfaces into lp://qastaging/~maas-committers/maas/trunk

Proposed by Jason Hobbs
Status: Superseded
Proposed branch: lp://qastaging/~jason-hobbs/maas/add-option-to-disable-dhclient-on-all-interfaces
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 189 lines (+65/-8)
5 files modified
src/maasserver/forms_settings.py (+10/-0)
src/maasserver/models/config.py (+1/-0)
src/metadataserver/api.py (+5/-3)
src/metadataserver/models/commissioningscript.py (+22/-5)
src/metadataserver/models/tests/test_noderesults.py (+27/-0)
To merge this branch: bzr merge lp://qastaging/~jason-hobbs/maas/add-option-to-disable-dhclient-on-all-interfaces
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Christian Reis (community) Needs Information
Review via email: mp+239167@code.qastaging.launchpad.net

Commit message

Add an option to enable/disable DHCP discovery on unconfigured interfaces of commissioning nodes. By default, DHCP discovery on unconfigured interfaces of commissioning nodes is enabled.

Description of the change

This isn't the final solution for this bug but provides a way for users to avoid its behavior for now, if it causes them problems.

To post a comment you must log in.
Revision history for this message
Christian Reis (kiko) wrote :

I'm not sure about this one, and I certainly didn't expect to see this exposed via the UI. Some further thinking:

* For trunk, I'd like us to explore the "correct" fix of releasing the IP allocated (or experimenting with a custom dhcp probe client).
* For 1.7, I would accept a VERY SMALL patch that disables this. This patch is way too big.

What do you think?

review: Needs Information
Revision history for this message
Gavin Panella (allenap) wrote :

This is a good workaround for the problem. A few minor comments, that's all.

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

On Wednesday 22 Oct 2014 11:02:48 you wrote:
> Review: Needs Information
>
> I'm not sure about this one, and I certainly didn't expect to see this
> exposed via the UI. Some further thinking:
>
> * For trunk, I'd like us to explore the "correct" fix of releasing the IP
> allocated (or experimenting with a custom dhcp probe client). * For 1.7, I
> would accept a VERY SMALL patch that disables this. This patch is way too
> big.
>
> What do you think?

I think he did it like this because the cloud installer (which is going to use
1.7) needs the functionality enabled.

It seems like a low-risk change to me.

Revision history for this message
Christian Reis (kiko) wrote :

I know that the LSCI requires this functionality; I wasn't suggesting reverting it. However, this patch is too big for 1.7.

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

Ok I'm sorry then, I must have misunderstood what you meant by "patch that disables this", what sort of thing did you have in mind here?

3277. By Jason Hobbs

Don't display the enable DHCP on unconfigured interfaces option.

3278. By Jason Hobbs

more removals.

3279. By Jason Hobbs

review fix

Revision history for this message
Jason Hobbs (jason-hobbs) wrote :

Ok - I dropped the UI parts which made the patch smaller, and addressed Gavin's comment on the part left. The patch really can't get any smaller than this.

Unmerged revisions

3279. By Jason Hobbs

review fix

3278. By Jason Hobbs

more removals.

3277. By Jason Hobbs

Don't display the enable DHCP on unconfigured interfaces option.

3276. By Jason Hobbs

Add a doctstring.

3275. By Jason Hobbs

fix test class name.

3274. By Jason Hobbs

add unit tests for get_builtin_commissioning_scripts().

3273. By Jason Hobbs

Add a unit test for the view

3272. By Jason Hobbs

Add an option to enable/disable DHCP discovery on unconfigured interfaces of commissioning nodes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.