Skip to content

Commit 905f32b

Browse files
authored
Merge pull request #523 from lemrouch/master
Fix multiple additional flags for docker_network
2 parents e8f390d + 5b3857a commit 905f32b

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

lib/puppet/provider/docker_network/ruby.rb

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,17 @@ def network_conf
2323
['--ipam-driver=%s', :ipam_driver],
2424
['--aux-address=%s', :aux_address],
2525
['--opt=%s', :options],
26-
['%s', :additional_flags],
2726
].each do |(format, key)|
2827
values = resource[key]
2928
new_flags = multi_flags.call(values, format)
3029
flags.concat(new_flags)
3130
end
31+
if resource[:additional_flags].is_a?(String)
32+
additional_flags = resource[:additional_flags].split
33+
additional_flags.each do |additional_flag|
34+
flags << additional_flag
35+
end
36+
end
3237
flags << resource[:name]
3338
end
3439

spec/unit/lib/puppet/type/docker_network_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
:ip_range,
1313
:aux_address,
1414
:options,
15+
:additional_flags,
1516
]
1617
end
1718

0 commit comments

Comments
 (0)