Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Openbsd support #147

Merged
merged 13 commits into from Mar 26, 2020
Merged

add Openbsd support #147

merged 13 commits into from Mar 26, 2020

Conversation

goneri
Copy link
Contributor

@goneri goneri commented Dec 29, 2019

Based on: #62

@goneri goneri changed the title Openbsd WIP: Openbsd Dec 29, 2019
Copy link
Collaborator

@igalic igalic left a comment

🙋

cloudinit/distros/bsd_util.py Outdated Show resolved Hide resolved
@goneri goneri changed the title WIP: Openbsd add Openbsd support Jan 1, 2020
@goneri goneri force-pushed the openbsd branch 2 times, most recently from 1e32253 to b4bf785 Compare Jan 8, 2020
Copy link
Collaborator

@raharper raharper left a comment

This is quite the large PR! Congrats for putting this all together. I've left quite a few questions and concerns in there. I'm looking forward to adding some more BSD support.

cloudinit/distros/bsd_util.py Outdated Show resolved Hide resolved
cloudinit/distros/bsd_util.py Outdated Show resolved Hide resolved
cloudinit/distros/netbsd.py Outdated Show resolved Hide resolved
cloudinit/distros/netbsd.py Outdated Show resolved Hide resolved
cloudinit/distros/netbsd.py Outdated Show resolved Hide resolved
cloudinit/net/openbsd.py Outdated Show resolved Hide resolved
cloudinit/net/openbsd.py Show resolved Hide resolved
cloudinit/tests/helpers.py Outdated Show resolved Hide resolved
cloudinit/sources/DataSourceNoCloud.py Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
@goneri goneri force-pushed the openbsd branch 2 times, most recently from 3002935 to e6f61b3 Compare Feb 23, 2020
@OddBloke OddBloke self-assigned this Mar 13, 2020
@OddBloke OddBloke added the wip label Mar 13, 2020
@OddBloke
Copy link
Collaborator

@OddBloke OddBloke commented Mar 13, 2020

This requires reconciliation with master, so marking it as wip for now.

@goneri goneri force-pushed the openbsd branch 2 times, most recently from 3a93a63 to b15776b Compare Mar 23, 2020
@goneri
Copy link
Contributor Author

@goneri goneri commented Mar 23, 2020

@OddBloke Could you please remove the wip label? the Pr is ready for review.

@OddBloke OddBloke removed the wip label Mar 23, 2020
Copy link
Collaborator

@OddBloke OddBloke left a comment

Thanks for taking this on, it's much appreciated! At a high level, I think there's a fair amount of duplication between netbsd.py and the new openbsd.py. I'd like us to do some refactoring to reduce that duplication, as it will come back to bite us before too long.

Once that's happened, I'll give this a closer review (I didn't want to ask for changes to the copy/paste'd code, because that's how we end up with subtly out-of-sync parallel implementations).

cloudinit/distros/bsd.py Outdated Show resolved Hide resolved
cloudinit/distros/openbsd.py Outdated Show resolved Hide resolved
cloudinit/distros/openbsd.py Outdated Show resolved Hide resolved
cloudinit/net/openbsd.py Outdated Show resolved Hide resolved
cmd.extend(args)

pkglist = util.expand_package_list('%s-%s', pkgs)
cmd.extend(pkglist)
Copy link
Collaborator

@OddBloke OddBloke Mar 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be resolved.

@goneri goneri force-pushed the openbsd branch 3 times, most recently from 62de1e6 to 788ba0c Compare Mar 24, 2020
Copy link
Collaborator

@OddBloke OddBloke left a comment

Thanks for the changes. I've performed a more detailed review now, but overall this looks pretty good!

cloudinit/distros/netbsd.py Show resolved Hide resolved
cloudinit/net/openbsd.py Outdated Show resolved Hide resolved
cloudinit/sources/DataSourceConfigDrive.py Outdated Show resolved Hide resolved
tools/build-on-openbsd Outdated Show resolved Hide resolved
cloudinit/util.py Outdated Show resolved Hide resolved
cloudinit/sources/DataSourceNoCloud.py Outdated Show resolved Hide resolved
cloudinit/net/openbsd.py Show resolved Hide resolved
cloudinit/distros/openbsd.py Show resolved Hide resolved
cloudinit/distros/openbsd.py Outdated Show resolved Hide resolved
cloudinit/net/openbsd.py Outdated Show resolved Hide resolved
cloudinit/util.py Show resolved Hide resolved
@goneri goneri requested review from OddBloke and igalic Mar 26, 2020
Copy link
Collaborator

@OddBloke OddBloke left a comment

Thanks for this iteration, this is looking a lot better! Still a few loose ends I've commented on inline.

cloudinit/distros/netbsd.py Outdated Show resolved Hide resolved
cloudinit/net/__init__.py Outdated Show resolved Hide resolved
cloudinit/net/openbsd.py Outdated Show resolved Hide resolved
cloudinit/net/__init__.py Outdated Show resolved Hide resolved
cloudinit/util.py Outdated Show resolved Hide resolved
cloudinit/util.py Outdated Show resolved Hide resolved
cloudinit/util.py Show resolved Hide resolved
@goneri goneri requested a review from OddBloke Mar 26, 2020
Copy link
Collaborator

@OddBloke OddBloke left a comment

This LGTM now, thanks for all your hard work on it!

Copy link
Collaborator

@raharper raharper left a comment

Looks good, just a change and a question.

cloudinit/distros/openbsd.py Show resolved Hide resolved
cloudinit/net/__init__.py Outdated Show resolved Hide resolved
cloudinit/distros/openbsd.py Show resolved Hide resolved
cloudinit/net/openbsd.py Show resolved Hide resolved
cloudinit/net/openbsd.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@raharper raharper left a comment

I'd like to clarify expectations on dhcp on all nics, and one name fix up (net -> open).

@goneri goneri requested a review from raharper Mar 26, 2020
Copy link
Collaborator

@raharper raharper left a comment

OK. Thanks for all the work here. As we discussed in IRC, we'll defer the multi-nic DHCP fix to another PR since it needs to be fixed for all BSD variants.

@OddBloke OddBloke merged commit 4403962 into canonical:master Mar 26, 2020
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants