From 84f7c019f9fcc6b82f712bff7ca4e9c0b88237d6 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 1 Apr 2014 21:57:23 -0700 Subject: [PATCH] kernel/v2: allow private network type to be a string [GH-3349] --- CHANGELOG.md | 2 ++ plugins/kernel_v2/config/vm.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a340fca5..b26bb27ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ BUG FIXES: - core: Removing a specific box version that doesn't exist doesn't crash Vagrant. [GH-3364] - core: SSH commands are forced to be ASCII. + - core: private networks with DHCP type work if type parameter is + a string and not a symbol. [GH-3349] - commands/status: Machine readable output contains the target. [GH-3218] - guests/debian: Changing host name works properly. [GH-3283] - guests/suse: Shutdown works correctly on SLES [GH-2775] diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index ec52104ab..e9e0df645 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -578,7 +578,7 @@ module VagrantPlugins end if type == :private_network - if options[:type] != :dhcp + if options[:type].to_sym != :dhcp if !options[:ip] errors << I18n.t("vagrant.config.vm.network_ip_required") end