Skip to content

Commit d578996

Browse files
committed
fix(pillar.example): remove spurious whitespaces found in yaml_dump
* Affects Fedora only; results in extra whitespaces before the closing single quotation mark where the trailing newline isn't stripped
1 parent 106f9cb commit d578996

2 files changed

Lines changed: 14 additions & 28 deletions

File tree

pillar.example

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dhcpd:
3939

4040
subnets:
4141
10.152.187.0:
42-
comment: |
42+
comment: |-
4343
No service will be given on this subnet, but declaring it helps the
4444
DHCP server to understand the network topology.
4545
netmask: 255.255.255.0
@@ -60,7 +60,7 @@ dhcpd:
6060
- rtr-239-0-2.example.org
6161

6262
10.254.239.32:
63-
comment: |
63+
comment: |-
6464
This declaration allows BOOTP clients to get dynamic addresses,
6565
which we don't really recommend.
6666
netmask: 255.255.255.224
@@ -87,7 +87,7 @@ dhcpd:
8787
max_lease_time: 7200
8888
hosts:
8989
jake:
90-
comment: |
90+
comment: |-
9191
Hosts can be specified for subnets, taking subnets defaults
9292
hardware: ethernet 08:00:a7:26:c0:a9
9393
fixed_address: 10.5.5.27
@@ -96,7 +96,7 @@ dhcpd:
9696

9797
hosts:
9898
passacaglia:
99-
comment: |
99+
comment: |-
100100
Hosts which require special configuration options can be listed in
101101
host statements. If no address is specified, the address will be
102102
allocated dynamically (if possible), but the host-specific information
@@ -107,7 +107,7 @@ dhcpd:
107107
server_name: toccata.fugue.com
108108

109109
fantasia:
110-
comment: |
110+
comment: |-
111111
Fixed IP addresses can also be specified for hosts. These addresses
112112
should not also be listed as being available for dynamic assignment.
113113
Hosts for which fixed IP addresses have been specified can boot using
@@ -119,7 +119,7 @@ dhcpd:
119119
fixed_address: fantasia.fugue.com
120120

121121
joe:
122-
comment: |
122+
comment: |-
123123
The hostname for a host can be passed in the DHCP response. Using the
124124
host_name key sets option host-name in the dhcpd configuration.
125125
hardware: ethernet 08:00:2b:4c:29:32
@@ -128,7 +128,7 @@ dhcpd:
128128

129129
classes:
130130
foo:
131-
comment: |
131+
comment: |-
132132
You can declare a class of clients and then do address allocation
133133
based on that. The example below shows a case where all clients
134134
in a certain class get addresses on the 10.17.224/24 subnet, and all

test/integration/default/controls/yaml_dump_spec.rb

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
1717
in a certain class get addresses on the 10.17.224/24 subnet, and all
1818
19-
other clients get addresses on the 10.0.29/24 subnet.
20-
21-
'
19+
other clients get addresses on the 10.0.29/24 subnet.'
2220
match: if substring (option vendor-class-identifier, 0, 4) = "SUNW"
2321
COMMON
2422
common02 = <<~COMMON.chomp
@@ -61,17 +59,13 @@
6159
6260
to which a BOOTP client is connected which has the dynamic-bootp flag
6361
64-
set.
65-
66-
'
62+
set.'
6763
hardware: ethernet 08:00:07:26:c0:a5
6864
fixed_address: fantasia.fugue.com
6965
joe:
7066
comment: 'The hostname for a host can be passed in the DHCP response. Using the
7167
72-
host_name key sets option host-name in the dhcpd configuration.
73-
74-
'
68+
host_name key sets option host-name in the dhcpd configuration.'
7569
hardware: ethernet 08:00:2b:4c:29:32
7670
fixed_address: joe.fugue.com
7771
host_name: joe
@@ -82,9 +76,7 @@
8276
8377
allocated dynamically (if possible), but the host-specific information
8478
85-
will still come from the host declaration.
86-
87-
'
79+
will still come from the host declaration.'
8880
hardware: ethernet 0:0:c0:5d:bd:95
8981
filename: vmunix.passacaglia
9082
server_name: toccata.fugue.com
@@ -146,9 +138,7 @@
146138
10.152.187.0:
147139
comment: 'No service will be given on this subnet, but declaring it helps the
148140
149-
DHCP server to understand the network topology.
150-
151-
'
141+
DHCP server to understand the network topology.'
152142
netmask: 255.255.255.0
153143
pools:
154144
- failover_peer: dhcp-failover
@@ -167,9 +157,7 @@
167157
10.254.239.32:
168158
comment: 'This declaration allows BOOTP clients to get dynamic addresses,
169159
170-
which we don''t really recommend.
171-
172-
'
160+
which we don''t really recommend.'
173161
netmask: 255.255.255.224
174162
dynamic_bootp: true
175163
range:
@@ -193,9 +181,7 @@
193181
max_lease_time: 7200
194182
hosts:
195183
jake:
196-
comment: 'Hosts can be specified for subnets, taking subnets defaults
197-
198-
'
184+
comment: Hosts can be specified for subnets, taking subnets defaults
199185
hardware: ethernet 08:00:a7:26:c0:a9
200186
fixed_address: 10.5.5.27
201187
update_static_leases: false

0 commit comments

Comments
 (0)