Skip to content

Commit a8d3711

Browse files
davejrtesalberg
authored andcommitted
fixing errors with bundle file conditional statement (puppetlabs#436)
1 parent f13f62b commit a8d3711

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/puppet/provider/docker_stack/ruby.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ def destroy
7878
end
7979

8080
def bundle_file
81-
return unless resource[:bundle_file].nil?
82-
resource[:bundle_file].map { |x| ['-c', x] }.flatten
81+
return resource[:bundle_file].map { |x| ['-c', x] }.flatten unless resource[:bundle_file].nil?
8382
end
8483

8584
def compose_files

manifests/run.pp

+1
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
Optional[Integer] $health_check_interval = undef,
138138
Optional[Array] $custom_unless = undef,
139139
) {
140+
include docker
140141
include docker::params
141142
if ($socket_connect != []) {
142143
$sockopts = join(any2array($socket_connect), ',')

0 commit comments

Comments
 (0)