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.

Sign up for GitHub

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

Jump to bottom

freebsd: introduce the freebsd renderer #61

Merged
merged 20 commits into from Dec 20, 2019
Merged

freebsd: introduce the freebsd renderer #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4a358ee
freebsd: introduce the freebsd renderer
goneri Mar 24, 2019
f063c20
freesd: use regex named groups
goneri Dec 2, 2019
bb963d9
freebsd: breaks up _write_network() in tree small functions
goneri Dec 7, 2019
71ccae3
extend find_fallback_nic() to support FreeBSD
igalic Nov 30, 2019
11f1e20
freebsd: use dns keys from NetworkState class
goneri Dec 17, 2019
3c2df00
freebsd: properly target the /etc/resolv.conf file
goneri Dec 17, 2019
4eb8d8a
freebsd: ignore 'service routing restart' ret code
goneri Dec 17, 2019
492e9cc
freebsd: handle case when metadata MAC local locally
goneri Dec 18, 2019
9cbb7ff
freebsd: show up a warning if several subnet found
goneri Dec 19, 2019
b8dc5da
freebsd: honor the target parameter in _write_network
goneri Dec 19, 2019
a2560b7
freebsd: log when a bad route is found
goneri Dec 19, 2019
b213147
freebsd: pass _postcmds to start_services()
goneri Dec 19, 2019
6df0877
freebsd: updatercconf() is depercated
goneri Dec 19, 2019
c08d41f
freebsd: ensure gateway is ipv4 before using it
goneri Dec 19, 2019
a9ef470
freebsd: find_fallback_nic, support FB10
goneri Dec 19, 2019
272f6eb
freebsd: use util.target_path() to load resolv.conf
goneri Dec 19, 2019
9b6e524
freebsd: skip subnet without netmask
goneri Dec 19, 2019
7cb2567
freebsd: get_devicelist returns netif list
goneri Dec 20, 2019
72228d7
replace rhel_util.update_sysconfig_file wrapper call, with a wrapper …
igalic Dec 19, 2019
d45058a
reverse if condition to remove an indent
igalic Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion cloudinit/config/cc_salt_minion.py
View file
Open in desktop
Expand Up @@ -46,6 +46,8 @@
import os

from cloudinit import safeyaml, util
from cloudinit.distros import rhel_util


# Note: see https://docs.saltstack.com/en/latest/topics/installation/
# Note: see https://docs.saltstack.com/en/latest/ref/configuration/
Expand Down Expand Up @@ -123,7 +125,8 @@ def handle(name, cfg, cloud, log, _args):
# we need to have the salt minion service enabled in rc in order to be
# able to start the service. this does only apply on FreeBSD servers.
if cloud.distro.osfamily == 'freebsd':
cloud.distro.updatercconf('salt_minion_enable', 'YES')
rhel_util.update_sysconfig_file(
'/etc/rc.conf', {'salt_minion_enable': 'YES'})

# restart salt-minion. 'service' will start even if not started. if it
# was started, it needs to be restarted for config change.
Expand Down
2 changes: 1 addition & 1 deletion cloudinit/distros/__init__.py
View file
Open in desktop
Expand Up @@ -145,7 +145,7 @@ def apply_network(self, settings, bring_up=True):
# Write it out

# pylint: disable=assignment-from-no-return
# We have implementations in arch, freebsd and gentoo still
# We have implementations in arch and gentoo still
dev_names = self._write_network(settings)
# pylint: enable=assignment-from-no-return
# Now try to bring them up
Expand Down