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

Move out cli argument generation to own function

This commit is contained in:
Brian Cain 2019-03-04 10:33:24 -08:00
parent 81fa7036be
commit 0b28580105
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ module VagrantPlugins
# @param[Hash] options - options from the network config
# @returns[Array] cli_opts - an array of strings used for the network commnad
def generate_connect_cli_arguments(options)
def generate_create_cli_arguments(options)
cli_opts = []
# Splits the networking options to generate the proper CLI flags for docker
@ -29,6 +29,20 @@ module VagrantPlugins
return cli_opts
end
# @param[Hash] options - options from the network config
# @returns[Array] cli_opts - an array of strings used for the network commnad
def generate_connect_cli_arguments(options)
cli_opts = []
if options[:ip]
cli_opts = ["--ip", options[:ip]]
elsif options[:ip6]
cli_opts = ["--ip6", options[:ip6]]
end
return cli_opts
end
def call(env)
# If we are using a host VM, then don't worry about it
machine = env[:machine]
@ -43,7 +57,7 @@ module VagrantPlugins
# We only handle private networks
next if type != :private_network
cli_opts = generate_connect_cli_arguments(options)
cli_opts = generate_create_cli_arguments(options)
if options[:subnet]
network_name = "vagrant_network_#{options[:subnet]}"
@ -63,12 +77,7 @@ module VagrantPlugins
end
@logger.debug("Connecting network #{network_name} to container guest #{machine.name}")
connect_opts = []
if options[:ip]
connect_opts = ["--ip", options[:ip]]
elsif options[:ip6]
connect_opts = ["--ip6", options[:ip6]]
end
connect_opts = generate_connect_cli_arguments(options)
machine.provider.driver.connect_network(network_name, container_id, connect_opts)
end