File tree 2 files changed +4
-6
lines changed
2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ def interfaces
102
102
Facter . add ( :docker ) do
103
103
setcode do
104
104
docker_version = Facter . value ( :docker_client_version )
105
- if docker_version !~ %r{1[.][0-9][0-2]?[.]\w +}
105
+ unless %r{1[.][0-9][0-2]?[.]\w +} . match? ( docker_version )
106
106
if Facter ::Util ::Resolution . which ( 'docker' )
107
107
docker_json_str = Facter ::Util ::Resolution . exec (
108
108
"#{ docker_command } info --format '{{json .}}'" ,
@@ -122,7 +122,7 @@ def interfaces
122
122
docker [ 'network' ] [ network ] = inspect [ 0 ]
123
123
network_id = docker [ 'network' ] [ network ] [ 'Id' ] [ 0 ..11 ]
124
124
interfaces . each do |iface |
125
- docker [ 'network' ] [ 'managed_interfaces' ] [ iface ] = network if iface =~ %r{#{ network_id } }
125
+ docker [ 'network' ] [ 'managed_interfaces' ] [ iface ] = network if %r{#{ network_id } } . match? ( iface )
126
126
end
127
127
end
128
128
docker
Original file line number Diff line number Diff line change @@ -80,10 +80,8 @@ module Puppet::Parser::Functions
80
80
opts [ 'registry_mirror' ] . each do |param |
81
81
flags << "--registry-mirror='#{ param } '"
82
82
end
83
- else
84
- if opts [ 'registry_mirror' ] && opts [ 'registry_mirror' ] . to_s != 'undef'
85
- flags << "--registry-mirror='#{ opts [ 'registry_mirror' ] } '"
86
- end
83
+ elsif opts [ 'registry_mirror' ] && opts [ 'registry_mirror' ] . to_s != 'undef'
84
+ flags << "--registry-mirror='#{ opts [ 'registry_mirror' ] } '"
87
85
end
88
86
89
87
if opts [ 'image' ] && opts [ 'image' ] . to_s != 'undef'
You can’t perform that action at this time.
0 commit comments