Skip to content

Commit 38810ae

Browse files
davejrtMarkW
authored andcommitted
fixes puppet run failures with no IPAM driver (#329)
1 parent b71811e commit 38810ae

File tree

1 file changed

+4
-1
lines changed
  • lib/puppet/provider/docker_network

1 file changed

+4
-1
lines changed

lib/puppet/provider/docker_network/ruby.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ def self.instances
3838
_, name, driver = line.split(' ')
3939
inspect = docker(['network', 'inspect', name])
4040
obj = JSON.parse(inspect).first
41+
ipam_driver = unless obj['IPAM']['Driver'].empty?
42+
obj['IPAM']['Driver']
43+
end
4144
subnet = unless obj['IPAM']['Config'].empty?
4245
if obj['IPAM']['Config'].first.key? 'Subnet'
4346
obj['IPAM']['Config'].first['Subnet']
@@ -46,7 +49,7 @@ def self.instances
4649
new(
4750
:name => name,
4851
:id => obj['Id'],
49-
:ipam_driver => obj['IPAM']['Driver'],
52+
:ipam_driver => ipam_driver,
5053
:subnet => subnet,
5154
:ensure => :present,
5255
:driver => driver,

0 commit comments

Comments
 (0)