summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bresson <david.bresson@lava.ai>2018-08-17 22:56:18 -0700
committerDavid Bresson <david.bresson@lava.ai>2018-08-17 23:45:23 -0700
commit47d1cc0936438d73986815af7602b68b9b1aca97 (patch)
tree88f85b4e5bc29ee237a2db24ea4f880d914f1d40
parent7395e450b0c15fa9f462039bc5a864f699960716 (diff)
downloadchef-47d1cc0936438d73986815af7602b68b9b1aca97.tar.gz
support repeated options in systemd_unit
Signed-off-by: David Bresson <dabresson@gmail.com>
-rw-r--r--lib/chef/resource/systemd_unit.rb4
-rw-r--r--spec/unit/resource/systemd_unit_spec.rb3
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/chef/resource/systemd_unit.rb b/lib/chef/resource/systemd_unit.rb
index 02194927ba..a4c3c3f180 100644
--- a/lib/chef/resource/systemd_unit.rb
+++ b/lib/chef/resource/systemd_unit.rb
@@ -61,7 +61,9 @@ class Chef
content.each_pair do |sect, opts|
doc.section(sect) do |section|
opts.each_pair do |opt, val|
- section.option(opt, val)
+ [val].flatten.each do |v|
+ section.option(opt, v)
+ end
end
end
end
diff --git a/spec/unit/resource/systemd_unit_spec.rb b/spec/unit/resource/systemd_unit_spec.rb
index fa30255885..f05418eb34 100644
--- a/spec/unit/resource/systemd_unit_spec.rb
+++ b/spec/unit/resource/systemd_unit_spec.rb
@@ -20,11 +20,12 @@ require "spec_helper"
describe Chef::Resource::SystemdUnit do
let(:resource) { Chef::Resource::SystemdUnit.new("sysstat-collect.timer") }
- let(:unit_content_string) { "[Unit]\nDescription = Run system activity accounting tool every 10 minutes\n\n[Timer]\nOnCalendar = *:00/10\n\n[Install]\nWantedBy = sysstat.service\n" }
+ let(:unit_content_string) { "[Unit]\nDescription = Run system activity accounting tool every 10 minutes\nDocumentation = foo\nDocumentation = bar\n\n[Timer]\nOnCalendar = *:00/10\n\n[Install]\nWantedBy = sysstat.service\n" }
let(:unit_content_hash) do
{
"Unit" => {
"Description" => "Run system activity accounting tool every 10 minutes",
+ "Documentation" => %w{foo bar},
},
"Timer" => {
"OnCalendar" => "*:00/10",