Skip to content

Commit f8c02e5

Browse files
thonixxthonixx
committed
handle arrays as arrays
this applies to: - nameservers search in several places - interfaces for bonds and bridges
1 parent 866073b commit f8c02e5

File tree

8 files changed

+67
-37
lines changed

8 files changed

+67
-37
lines changed

‎templates/bonds.epp‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@
209209
- <%= $add %>:
210210
<%- if $option['lifetime'] != undef { -%>
211211
lifetime: <%= $option['lifetime'] %>
212-
<%- } -%>
212+
<%- } -%>
213213
<%- if $option['label'] != undef { -%>
214214
label: <%= $option['label'] %>
215-
<%- } -%>
215+
<%- } -%>
216216
<%- } -%>
217217
<%- } else { -%>
218218
- <%= $address %>
@@ -234,7 +234,10 @@
234234
<%- if $nameservers != undef { -%>
235235
nameservers:
236236
<%- if $nameservers[search] != undef { -%>
237-
search: <%= $nameservers[search] %>
237+
search:
238+
<%- $nameservers[search].each |$search| { -%>
239+
- <%= $search %>
240+
<%- } -%>
238241
<%- } -%>
239242
<%- if $nameservers[addresses] != undef { -%>
240243
addresses:
@@ -315,7 +318,10 @@
315318
<%- } -%>
316319
<%# Properties for device type bonds -%>
317320
<%- if $interfaces != undef { -%>
318-
interfaces: <%= $interfaces %>
321+
interfaces:
322+
<%- $interfaces.each |$interface| { -%>
323+
- <%= $interface %>
324+
<%- } -%>
319325
<%- } -%>
320326
<%- if $parameters != undef { -%>
321327
parameters:

‎templates/bridges.epp‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@
196196
- <%= $add %>:
197197
<%- if $option['lifetime'] != undef { -%>
198198
lifetime: <%= $option['lifetime'] %>
199-
<%- } -%>
199+
<%- } -%>
200200
<%- if $option['label'] != undef { -%>
201201
label: <%= $option['label'] %>
202-
<%- } -%>
202+
<%- } -%>
203203
<%- } -%>
204204
<%- } else { -%>
205205
- <%= $address %>
@@ -221,7 +221,10 @@
221221
<%- if $nameservers != undef { -%>
222222
nameservers:
223223
<%- if $nameservers[search] != undef { -%>
224-
search: <%= $nameservers[search] %>
224+
search:
225+
<%- $nameservers[search].each |$search| { -%>
226+
- <%= $search %>
227+
<%- } -%>
225228
<%- } -%>
226229
<%- if $nameservers[addresses] != undef { -%>
227230
addresses:
@@ -302,7 +305,10 @@
302305
<%- } -%>
303306
<%# Properties for device type bridges -%>
304307
<%- if $interfaces != undef { -%>
305-
interfaces: <%= $interfaces %>
308+
interfaces:
309+
<%- $interfaces.each |$interface| { -%>
310+
- <%= $interface %>
311+
<%- } -%>
306312
<%- } -%>
307313
<%- if $parameters != undef { -%>
308314
parameters:

‎templates/dummy_devices.epp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@
183183
- <%= $add %>:
184184
<%- if $option['lifetime'] != undef { -%>
185185
lifetime: <%= $option['lifetime'] %>
186-
<%- } -%>
186+
<%- } -%>
187187
<%- if $option['label'] != undef { -%>
188188
label: <%= $option['label'] %>
189-
<%- } -%>
189+
<%- } -%>
190190
<%- } -%>
191191
<%- } else { -%>
192192
- <%= $address %>
@@ -208,7 +208,10 @@
208208
<%- if $nameservers != undef { -%>
209209
nameservers:
210210
<%- if $nameservers[search] != undef { -%>
211-
search: <%= $nameservers[search] %>
211+
search:
212+
<%- $nameservers[search].each |$search| { -%>
213+
- <%= $search %>
214+
<%- } -%>
212215
<%- } -%>
213216
<%- if $nameservers[addresses] != undef { -%>
214217
addresses:

‎templates/ethernets.epp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,10 @@
362362
<%- if $nameservers != undef { -%>
363363
nameservers:
364364
<%- if $nameservers[search] != undef { -%>
365-
search: <%= $nameservers[search] %>
365+
search:
366+
<%- $nameservers[search].each |$search| { -%>
367+
- <%= $search %>
368+
<%- } -%>
366369
<%- } -%>
367370
<%- if $nameservers[addresses] != undef { -%>
368371
addresses:

‎templates/modems.epp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@
178178
<%- if $openvswitch != undef { -%>
179179
openvswitch:
180180
<%- if $openvswitch[external_ids] != undef { -%>
181-
external-ids:
181+
external-ids:
182182
<%= $openvswitch[external_ids] %>
183183
<%- } -%>
184184
<%- if $openvswitch[other_config] != undef { -%>
185-
other-config:
185+
other-config:
186186
<%= $openvswitch[other_config] %>
187187
<%- } -%>
188188
<%- if $openvswitch[lacp] != undef { -%>
@@ -327,10 +327,10 @@
327327
- <%= $add %>:
328328
<%- if $option['lifetime'] != undef { -%>
329329
lifetime: <%= $option['lifetime'] %>
330-
<%- } -%>
330+
<%- } -%>
331331
<%- if $option['label'] != undef { -%>
332332
label: <%= $option['label'] %>
333-
<%- } -%>
333+
<%- } -%>
334334
<%- } -%>
335335
<%- } else { -%>
336336
- <%= $address %>
@@ -352,7 +352,10 @@
352352
<%- if $nameservers != undef { -%>
353353
nameservers:
354354
<%- if $nameservers[search] != undef { -%>
355-
search: <%= $nameservers[search] %>
355+
search:
356+
<%- $nameservers[search].each |$search| { -%>
357+
- <%= $search %>
358+
<%- } -%>
356359
<%- } -%>
357360
<%- if $nameservers[addresses] != undef { -%>
358361
addresses:

‎templates/tunnels.epp‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@
224224
- <%= $add %>:
225225
<%- if $option['lifetime'] != undef { -%>
226226
lifetime: <%= $option['lifetime'] %>
227-
<%- } -%>
227+
<%- } -%>
228228
<%- if $option['label'] != undef { -%>
229229
label: <%= $option['label'] %>
230-
<%- } -%>
230+
<%- } -%>
231231
<%- } -%>
232232
<%- } else { -%>
233233
- <%= $address %>
@@ -249,7 +249,10 @@
249249
<%- if $nameservers != undef { -%>
250250
nameservers:
251251
<%- if $nameservers[search] != undef { -%>
252-
search: <%= $nameservers[search] %>
252+
search:
253+
<%- $nameservers[search].each |$search| { -%>
254+
- <%= $search %>
255+
<%- } -%>
253256
<%- } -%>
254257
<%- if $nameservers[addresses] != undef { -%>
255258
addresses:
@@ -343,15 +346,15 @@
343346
<%- } -%>
344347
<%- if $key.is_a(Hash) { -%>
345348
key:
346-
<%- if $key[input] != undef { -%>
349+
<%- if $key[input] != undef { -%>
347350
input: <%= $key[input] %>
348351
<%- } -%>
349-
<%- if $key[output] != undef { -%>
352+
<%- if $key[output] != undef { -%>
350353
output: <%= $key[output] %>
351354
<%- } -%>
352-
<%- if $key['private'] != undef { -%>
355+
<%- if $key['private'] != undef { -%>
353356
private: <%= $key['private'] %>
354-
<%- } -%>
357+
<%- } -%>
355358
<%- } -%>
356359
<%- elsif $key.is_a(Scalar) { -%>
357360
key: <%= $key %>
@@ -367,19 +370,19 @@
367370
<%- $peers.each |$peer| { -%>
368371
- keys:
369372
public: <%= $peer[keys][public] %>
370-
<%- if $peer[keys][shared] != undef { -%>
373+
<%- if $peer[keys][shared] != undef { -%>
371374
shared: <%= $peer[keys][shared] %>
372375
<%- } -%>
373-
<%- if $peer[endpoint] != undef { -%>
376+
<%- if $peer[endpoint] != undef { -%>
374377
endpoint: <%= $peer[endpoint] %>
375378
<%- } -%>
376-
<%- if $peer[allowed_ips] != undef { -%>
379+
<%- if $peer[allowed_ips] != undef { -%>
377380
allowed-ips: <%= $peer[allowed_ips] %>
378381
<%- } -%>
379-
<%- if $peer[keepalive] != undef { -%>
382+
<%- if $peer[keepalive] != undef { -%>
380383
keepalive: <%= $peer[keepalive] %>
381384
<%- } -%>
382-
<%- } -%>
385+
<%- } -%>
383386
<%- } -%>
384387
<%- if $id != undef { -%>
385388
id: <%= $id %>

‎templates/vlans.epp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@
187187
- <%= $add %>:
188188
<%- if $option['lifetime'] != undef { -%>
189189
lifetime: <%= $option['lifetime'] %>
190-
<%- } -%>
190+
<%- } -%>
191191
<%- if $option['label'] != undef { -%>
192192
label: <%= $option['label'] %>
193-
<%- } -%>
193+
<%- } -%>
194194
<%- } -%>
195195
<%- } else { -%>
196196
- <%= $address %>
@@ -212,7 +212,10 @@
212212
<%- if $nameservers != undef { -%>
213213
nameservers:
214214
<%- if $nameservers[search] != undef { -%>
215-
search: <%= $nameservers[search] %>
215+
search:
216+
<%- $nameservers[search].each |$search| { -%>
217+
- <%= $search %>
218+
<%- } -%>
216219
<%- } -%>
217220
<%- if $nameservers[addresses] != undef { -%>
218221
addresses:

‎templates/wifis.epp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@
190190
<%- if $openvswitch != undef { -%>
191191
openvswitch:
192192
<%- if $openvswitch[external_ids] != undef { -%>
193-
external-ids:
193+
external-ids:
194194
<%= $openvswitch[external_ids] %>
195195
<%- } -%>
196196
<%- if $openvswitch[other_config] != undef { -%>
197-
other-config:
197+
other-config:
198198
<%= $openvswitch[other_config] %>
199199
<%- } -%>
200200
<%- if $openvswitch[lacp] != undef { -%>
@@ -339,10 +339,10 @@
339339
- <%= $add %>:
340340
<%- if $option['lifetime'] != undef { -%>
341341
lifetime: <%= $option['lifetime'] %>
342-
<%- } -%>
342+
<%- } -%>
343343
<%- if $option['label'] != undef { -%>
344344
label: <%= $option['label'] %>
345-
<%- } -%>
345+
<%- } -%>
346346
<%- } -%>
347347
<%- } else { -%>
348348
- <%= $address %>
@@ -364,7 +364,10 @@
364364
<%- if $nameservers != undef { -%>
365365
nameservers:
366366
<%- if $nameservers[search] != undef { -%>
367-
search: <%= $nameservers[search] %>
367+
search:
368+
<%- $nameservers[search].each |$search| { -%>
369+
- <%= $search %>
370+
<%- } -%>
368371
<%- } -%>
369372
<%- if $nameservers[addresses] != undef { -%>
370373
addresses:

0 commit comments

Comments
 (0)