From 4a0f1a0a33f13e017095b2c42b53fbf372e80d7f Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Thu, 28 Feb 2019 14:53:36 -0800 Subject: [PATCH] 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. --- plugins/providers/docker/action/network.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/providers/docker/action/network.rb b/plugins/providers/docker/action/network.rb index ed6abc7f5..500087078 100644 --- a/plugins/providers/docker/action/network.rb +++ b/plugins/providers/docker/action/network.rb @@ -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]]) - end - - if options[:docker__ip] - cli_opts[:connect].concat(["--ip", options[:docker__ip]]) + 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 + return cli_opts end