summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorShreenidhi Shedi <53473811+sshedi@users.noreply.github.com>2021-08-31 00:51:10 +0530
committerGitHub <noreply@github.com>2021-08-30 14:21:10 -0500
commit7fc3f08ebc20eb496b3d318bb718ece569b10dba (patch)
tree9399b1b552aafa5f16096bd54e1566c1576bdc40 /cloudinit
parentde8931edc4093013fd685938e1c4e5a3d53f653c (diff)
downloadvyos-cloud-init-7fc3f08ebc20eb496b3d318bb718ece569b10dba.tar.gz
vyos-cloud-init-7fc3f08ebc20eb496b3d318bb718ece569b10dba.zip
Add support to accept-ra in networkd renderer (#999)
Also fix search path in networkd
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/net/networkd.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/cloudinit/net/networkd.py b/cloudinit/net/networkd.py
index a311572f..ee6fd2ad 100644
--- a/cloudinit/net/networkd.py
+++ b/cloudinit/net/networkd.py
@@ -160,6 +160,10 @@ class Renderer(renderer.Renderer):
cfg.update_section(sec, 'DHCP', dhcp)
+ if (dhcp in ['ipv6', 'yes'] and
+ isinstance(iface.get('accept-ra', ''), bool)):
+ cfg.update_section(sec, 'IPv6AcceptRA', iface['accept-ra'])
+
# This is to accommodate extra keys present in VMware config
def dhcp_domain(self, d, cfg):
for item in ['dhcp4domain', 'dhcp6domain']:
@@ -247,7 +251,7 @@ class Renderer(renderer.Renderer):
def available(target=None):
expected = ['ip', 'systemctl']
- search = ['/usr/bin', '/bin']
+ search = ['/usr/sbin', '/bin']
for p in expected:
if not subp.which(p, search=search, target=target):
return False