1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151 | diff --git a/doc/example-config b/doc/example-config
index 23ec60b..05f68d0 100644
--- a/doc/example-config
+++ b/doc/example-config
@@ -15,6 +15,9 @@ network:
- 2001:1::1/64
gateway4: 192.168.14.1
gateway6: 2001:1::2
+ nameservers:
+ search: [foo.local, bar.local]
+ addresses: [8.8.8.8]
lom:
match:
driver: ixgbe
@@ -49,12 +52,9 @@ network:
# set-name: allowed
br0:
# IDs of the components; switchports expands into multiple interfaces
- interfaces: [my_ap, switchports]
+ interfaces: [wlp1s0, switchports]
dhcp4: true
routes:
- to: 0.0.0.0/0
via: 11.0.0.1
metric: 3
- nameservers:
- search: [foo.local, bar.local]
- addresses: [8.8.8.8]
diff --git a/doc/netplan.md b/doc/netplan.md
index 7954744..952b8c8 100644
--- a/doc/netplan.md
+++ b/doc/netplan.md
@@ -280,6 +280,9 @@ This is a complex example which shows most available features:
- 2001:1::1/64
gateway4: 192.168.14.1
gateway6: 2001:1::2
+ nameservers:
+ search: [foo.local, bar.local]
+ addresses: [8.8.8.8]
lom:
match:
driver: ixgbe
@@ -320,9 +323,6 @@ This is a complex example which shows most available features:
- to: 0.0.0.0/0
via: 11.0.0.1
metric: 3
- nameservers:
- search: [foo.local, bar.local]
- addresses: [8.8.8.8]
<!--- vim: ft=markdown
-->
diff --git a/tests/generate.py b/tests/generate.py
index d7ec953..7772e94 100755
--- a/tests/generate.py
+++ b/tests/generate.py
@@ -680,6 +680,37 @@ Gateway=192.168.14.1
Gateway=2001:FFfe::2
'''})
+ def test_nameserver(self):
+ self.generate('''network:
+ version: 2
+ ethernets:
+ engreen:
+ addresses: ["192.168.14.2/24"]
+ nameservers:
+ addresses: [1.2.3.4, "1234::FFFF"]
+ enblue:
+ addresses: ["192.168.1.3/24"]
+ nameservers:
+ search: [lab, kitchen]
+ addresses: [8.8.8.8]''')
+
+ self.assert_networkd({'engreen.network': '''[Match]
+Name=engreen
+
+[Network]
+Address=192.168.14.2/24
+DNS=1.2.3.4
+DNS=1234::FFFF
+''',
+ 'enblue.network': '''[Match]
+Name=enblue
+
+[Network]
+Address=192.168.1.3/24
+DNS=8.8.8.8
+Domains=lab kitchen
+'''})
+
def test_vlan(self):
self.generate('''network:
version: 2
@@ -1500,6 +1531,56 @@ address1=2001:FFfe::1/64
gateway=2001:FFfe::2
'''})
+ def test_nameserver(self):
+ self.generate('''network:
+ version: 2
+ renderer: NetworkManager
+ ethernets:
+ engreen:
+ addresses: ["192.168.14.2/24"]
+ nameservers:
+ addresses: [1.2.3.4, 2.3.4,5, "1234::FFFF"]
+ enblue:
+ addresses: ["192.168.1.3/24"]
+ nameservers:
+ search: [lab, kitchen]
+ addresses: [8.8.8.8]''')
+
+ self.assert_nm({'engreen': '''[connection]
+id=netplan-engreen
+type=ethernet
+interface-name=engreen
+
+[ethernet]
+wake-on-lan=0
+
+[ipv4]
+method=manual
+address1=192.168.14.2/24
+dns=1.2.3.4;2.3.4.5;
+
+[ipv6]
+method=manual
+dns=1234::FFFF;
+''',
+ 'enblue': '''[connection]
+id=netplan-enblue
+type=ethernet
+interface-name=enblue
+
+[ethernet]
+wake-on-lan=0
+
+[ipv4]
+method=manual
+address1=192.168.1.3/24
+dns=8.8.8.8;
+dns-search=lab;kitchen;
+
+[ipv6]
+method=manual
+'''})
+
def test_vlan(self):
self.generate('''network:
version: 2
|