haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update docker network action to auto-generate cli flags 

This commit updates the docker network behavior to auto-generate the
docker network command flags from Vagrants network config option.
This commit is contained in:
Brian Cain 2019-02-28 14:53:36 -08:00
parent b5a092397f
commit 4a0f1a0a33
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/providers/docker/action/network.rb
View File

@ -45,16 +45,16 @@ module VagrantPlugins
def parse_cli_arguments(options)
cli_opts = {create: [], connect: []}
# make this a function that generates the proper flags
# Splits the networking options to generate the proper CLI flags for docker
if options[:type] != "dhcp"
if options[:docker__subnet]
cli_opts[:create].concat(["--subnet", options[:docker__subnet]])
options.each do |opt, value|
vals = opt.to_s.split("__")
if vals[0] == "docker" && vals.size == 3
cli_opts[vals[1].to_sym].concat(["--#{vals[2]}", value])
end
end
end
if options[:docker__ip]
cli_opts[:connect].concat(["--ip", options[:docker__ip]])
end
end
return cli_opts
end