Add Netbsd support #62
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
goneri
force-pushed
the
netbsd
branch
2 times, most recently
from
142770f
to
0397ebc
Compare
goneri
force-pushed
the
netbsd
branch
4 times, most recently
from
021c311
to
12bd49f
Compare
goneri
force-pushed
the
netbsd
branch
4 times, most recently
from
f7a3ac6
to
a2e1d2f
Compare
OddBloke
added
CLA not signed
goneri
force-pushed
the
netbsd
branch
2 times, most recently
from
dd2312f
to
36d59dd
Compare
goneri
force-pushed
the
netbsd
branch
3 times, most recently
from
9489b64
to
2c001cd
Compare
igalic
reviewed
Dec 23, 2019
cloudinit/distros/netbsd.py
Outdated
| return bsd_util.get_rc_config_value('hostname') | ||
|
|
||
| def _write_hostname(self, hostname, filename): | ||
| bsd_util.set_rc_config_value('hostname', hostname, |
There was a problem hiding this comment.
in freebsd, we use rhel_util, how is this different?
There was a problem hiding this comment.
on NetBSD, the /etc/rc.conf comes with a if block. As a result, it's not a simple list of key/value anymore. The rhel_util parser cannot parse the file properly. And so I decided to write these two light setter/getter functions. The code is rather naive, but I think it's enough for now.
We can potentially find the same situation on FreeBSD, so I updated the FreeBSD files to use them too.
There was a problem hiding this comment.
Shallow person question: Is there enough alignment between netbsd and freebsd that one could a be a subclass of the other distro? (like ubuntu.py is a subclass of debian distro as it is a derivative work that can share the same distro class methods). As you've implemented this netbsd is a subclass only of top-level Distro class and thus has to redefine all methods.
cloudinit/distros/netbsd.py
Outdated
| util.subp(cmd, env=e, capture=False) | ||
|
|
||
| def apply_locale(self, locale, out_fn=None): | ||
| pass |
There was a problem hiding this comment.
I don't really plan to implement that. I don't think it makes any sense in 2019 to change the locale.
goneri
force-pushed
the
netbsd
branch
2 times, most recently
from
5cc3629
to
8069556
Compare
goneri
force-pushed
the
netbsd
branch
3 times, most recently
from
517531a
to
23ca438
Compare
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 4, 2020
Add a comment in the module to explain the difference with the other rc file parse: cloudinit.distros.parsers.sys_conf On NetBSD, /etc/rc.conf comes with a if block: if [ -r /etc/defaults/rc.conf ]; then as a consequence, the file is not a regular key/value list anymore and we cannot use cloudinit.distros.parsers.sys_conf The module comes with a more naive parser, but is able to preserve these if blocks. See: canonical#62 (comment)
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 4, 2020
As suggested by Chad Smith. See: canonical#62 (comment)
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 6, 2020
Add a comment in the module to explain the difference with the other rc file parse: cloudinit.distros.parsers.sys_conf On NetBSD, /etc/rc.conf comes with a if block: if [ -r /etc/defaults/rc.conf ]; then as a consequence, the file is not a regular key/value list anymore and we cannot use cloudinit.distros.parsers.sys_conf The module comes with a more naive parser, but is able to preserve these if blocks. See: canonical#62 (comment)
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 6, 2020
As suggested by Chad Smith. See: canonical#62 (comment)
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 11, 2020
Add a comment in the module to explain the difference with the other rc file parse: cloudinit.distros.parsers.sys_conf On NetBSD, /etc/rc.conf comes with a if block: if [ -r /etc/defaults/rc.conf ]; then as a consequence, the file is not a regular key/value list anymore and we cannot use cloudinit.distros.parsers.sys_conf The module comes with a more naive parser, but is able to preserve these if blocks. See: canonical#62 (comment)
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 11, 2020
As suggested by Chad Smith. See: canonical#62 (comment)
Add support for the NetBSD Operating System. This branch has been tested with: - NoCloud and OpenStack (with and without config-drive) - and NetBSD 7.1, 8.0 and 8.1. - Python 3.7 only, because of the dependency oncrypt.METHOD_BLOWFISH. This version is available in NetBSD 7, 8 and 9 anyway.
Add a comment in the module to explain the difference with the other rc file parse: cloudinit.distros.parsers.sys_conf On NetBSD, /etc/rc.conf comes with a if block: if [ -r /etc/defaults/rc.conf ]; then as a consequence, the file is not a regular key/value list anymore and we cannot use cloudinit.distros.parsers.sys_conf The module comes with a more naive parser, but is able to preserve these if blocks. See: canonical#62 (comment)
As suggested by Chad Smith. See: canonical#62 (comment)
Ensure `members` is an optional argument, like in the master class.
This was just a duplicated copy of the original `create_user()`.
In the original `create_group()`, `members` is an optional argument.
The original `create_user()` method should work just fine on FreeBSD.
The BSD distros will now inherite from this base BSD class.
There is a lot of duplication of code that could be shared between
the FreeBSD and NetBSD classes. Let's avoid as much boilerplate
cut-n-paste as possible.
Move the following methods up into the parent BSD class:
* create_group which now uses group_add_cmd_prefix and
_get_add_member_to_group_cmd to specialize subclass commands
* install_packages can be generalized since NetBSD.update_package_sources
is nothing
* package_command is generalized with minor command diffs sourced from
class attributes pkg_cmd_install_prefix and pkg_cmd_remove_prefix and
custom environment given by _get_pkg_cmd_environ
Also in this commit:
* A bug fix in existing Freebsd which was switching group name and
and username parameters
* I left a TODO message for your review as I don't think either BSD class
handles a distro.package_command('upgrade') call and it might be needed
in a followup PR
blackboxsw
reviewed
Mar 12, 2020
Looks really good.
I've rebased against current master and tried consolidating a couple of more common methods up from Freebsd and Netbsd into the parent BSD class.
Please see what you think. The git show 7ee08d3 should show the set of diffs I was thinking of:
Move the following methods up into the parent BSD class:
* create_group which now uses group_add_cmd_prefix and
_get_add_member_to_group_cmd to specialize subclass commands
* install_packages can be generalized since NetBSD.update_package_sources
is nothing
* package_command is generalized with minor command diffs sourced from
class attributes pkg_cmd_install_prefix and pkg_cmd_remove_prefix and
custom environment given by _get_pkg_cmd_environ
Also in this commit:
* A bug fix in existing Freebsd which was switching group name and
and username parameters
* I left a TODO message for your review as I don't think either BSD class
handles a distro.package_command('upgrade') call and it might be needed
in a followup PR
|
@goneri I'm ok with this if you are ok with the patch I added. the one question is when you'd like to handle package_command('upgrade') |
|
Looks good to me:
|
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 24, 2020
Add a comment in the module to explain the difference with the other rc file parse: cloudinit.distros.parsers.sys_conf On NetBSD, /etc/rc.conf comes with a if block: if [ -r /etc/defaults/rc.conf ]; then as a consequence, the file is not a regular key/value list anymore and we cannot use cloudinit.distros.parsers.sys_conf The module comes with a more naive parser, but is able to preserve these if blocks. See: canonical#62 (comment)
goneri
added a commit
to goneri/cloud-init
that referenced
this issue
Mar 24, 2020
As suggested by Chad Smith. See: canonical#62 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Add support for the NetBSD Operating System.
Features in this branch:
This branch has been tested with:
This version is available in NetBSD 7, 8 and 9 anyway.