Skip to content

Treat arrays as array (nameserver search, interfaces) #34

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Treat arrays as array (nameserver search, interfaces) #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions templates/bonds.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,10 @@
- <%= $add %>:
<%- if $option['lifetime'] != undef { -%>
lifetime: <%= $option['lifetime'] %>
<%- } -%>
<%- } -%>
<%- if $option['label'] != undef { -%>
label: <%= $option['label'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } else { -%>
- <%= $address %>
Expand All @@ -234,7 +234,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down Expand Up @@ -315,7 +318,10 @@
<%- } -%>
<%# Properties for device type bonds -%>
<%- if $interfaces != undef { -%>
interfaces: <%= $interfaces %>
interfaces:
<%- $interfaces.each |$interface| { -%>
- <%= $interface %>
<%- } -%>
<%- } -%>
<%- if $parameters != undef { -%>
parameters:
Expand Down
14 changes: 10 additions & 4 deletions templates/bridges.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,10 @@
- <%= $add %>:
<%- if $option['lifetime'] != undef { -%>
lifetime: <%= $option['lifetime'] %>
<%- } -%>
<%- } -%>
<%- if $option['label'] != undef { -%>
label: <%= $option['label'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } else { -%>
- <%= $address %>
Expand All @@ -221,7 +221,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down Expand Up @@ -302,7 +305,10 @@
<%- } -%>
<%# Properties for device type bridges -%>
<%- if $interfaces != undef { -%>
interfaces: <%= $interfaces %>
interfaces:
<%- $interfaces.each |$interface| { -%>
- <%= $interface %>
<%- } -%>
<%- } -%>
<%- if $parameters != undef { -%>
parameters:
Expand Down
9 changes: 6 additions & 3 deletions templates/dummy_devices.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@
- <%= $add %>:
<%- if $option['lifetime'] != undef { -%>
lifetime: <%= $option['lifetime'] %>
<%- } -%>
<%- } -%>
<%- if $option['label'] != undef { -%>
label: <%= $option['label'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } else { -%>
- <%= $address %>
Expand All @@ -208,7 +208,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down
5 changes: 4 additions & 1 deletion templates/ethernets.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down
13 changes: 8 additions & 5 deletions templates/modems.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@
<%- if $openvswitch != undef { -%>
openvswitch:
<%- if $openvswitch[external_ids] != undef { -%>
external-ids:
external-ids:
<%= $openvswitch[external_ids] %>
<%- } -%>
<%- if $openvswitch[other_config] != undef { -%>
other-config:
other-config:
<%= $openvswitch[other_config] %>
<%- } -%>
<%- if $openvswitch[lacp] != undef { -%>
Expand Down Expand Up @@ -327,10 +327,10 @@
- <%= $add %>:
<%- if $option['lifetime'] != undef { -%>
lifetime: <%= $option['lifetime'] %>
<%- } -%>
<%- } -%>
<%- if $option['label'] != undef { -%>
label: <%= $option['label'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } else { -%>
- <%= $address %>
Expand All @@ -352,7 +352,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down
27 changes: 15 additions & 12 deletions templates/tunnels.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@
- <%= $add %>:
<%- if $option['lifetime'] != undef { -%>
lifetime: <%= $option['lifetime'] %>
<%- } -%>
<%- } -%>
<%- if $option['label'] != undef { -%>
label: <%= $option['label'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } else { -%>
- <%= $address %>
Expand All @@ -249,7 +249,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down Expand Up @@ -343,15 +346,15 @@
<%- } -%>
<%- if $key.is_a(Hash) { -%>
key:
<%- if $key[input] != undef { -%>
<%- if $key[input] != undef { -%>
input: <%= $key[input] %>
<%- } -%>
<%- if $key[output] != undef { -%>
<%- if $key[output] != undef { -%>
output: <%= $key[output] %>
<%- } -%>
<%- if $key['private'] != undef { -%>
<%- if $key['private'] != undef { -%>
private: <%= $key['private'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- elsif $key.is_a(Scalar) { -%>
key: <%= $key %>
Expand All @@ -367,19 +370,19 @@
<%- $peers.each |$peer| { -%>
- keys:
public: <%= $peer[keys][public] %>
<%- if $peer[keys][shared] != undef { -%>
<%- if $peer[keys][shared] != undef { -%>
shared: <%= $peer[keys][shared] %>
<%- } -%>
<%- if $peer[endpoint] != undef { -%>
<%- if $peer[endpoint] != undef { -%>
endpoint: <%= $peer[endpoint] %>
<%- } -%>
<%- if $peer[allowed_ips] != undef { -%>
<%- if $peer[allowed_ips] != undef { -%>
allowed-ips: <%= $peer[allowed_ips] %>
<%- } -%>
<%- if $peer[keepalive] != undef { -%>
<%- if $peer[keepalive] != undef { -%>
keepalive: <%= $peer[keepalive] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } -%>
<%- if $id != undef { -%>
id: <%= $id %>
Expand Down
9 changes: 6 additions & 3 deletions templates/vlans.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@
- <%= $add %>:
<%- if $option['lifetime'] != undef { -%>
lifetime: <%= $option['lifetime'] %>
<%- } -%>
<%- } -%>
<%- if $option['label'] != undef { -%>
label: <%= $option['label'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } else { -%>
- <%= $address %>
Expand All @@ -212,7 +212,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down
13 changes: 8 additions & 5 deletions templates/wifis.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@
<%- if $openvswitch != undef { -%>
openvswitch:
<%- if $openvswitch[external_ids] != undef { -%>
external-ids:
external-ids:
<%= $openvswitch[external_ids] %>
<%- } -%>
<%- if $openvswitch[other_config] != undef { -%>
other-config:
other-config:
<%= $openvswitch[other_config] %>
<%- } -%>
<%- if $openvswitch[lacp] != undef { -%>
Expand Down Expand Up @@ -339,10 +339,10 @@
- <%= $add %>:
<%- if $option['lifetime'] != undef { -%>
lifetime: <%= $option['lifetime'] %>
<%- } -%>
<%- } -%>
<%- if $option['label'] != undef { -%>
label: <%= $option['label'] %>
<%- } -%>
<%- } -%>
<%- } -%>
<%- } else { -%>
- <%= $address %>
Expand All @@ -364,7 +364,10 @@
<%- if $nameservers != undef { -%>
nameservers:
<%- if $nameservers[search] != undef { -%>
search: <%= $nameservers[search] %>
search:
<%- $nameservers[search].each |$search| { -%>
- <%= $search %>
<%- } -%>
<%- } -%>
<%- if $nameservers[addresses] != undef { -%>
addresses:
Expand Down