Show an error if an invalid network type is used
This commit is contained in:
parent
bc2a9fe780
commit
a8a7a7865d
|
@ -24,6 +24,7 @@ BUG FIXES:
|
||||||
status 126). [GH-934]
|
status 126). [GH-934]
|
||||||
- Action hook prepend/append will only prepend or append once.
|
- Action hook prepend/append will only prepend or append once.
|
||||||
- Retry SSH on Errno::EACCES.
|
- Retry SSH on Errno::EACCES.
|
||||||
|
- Show an error if an invalid network type is used.
|
||||||
|
|
||||||
## 1.1.4 (March 25, 2013)
|
## 1.1.4 (March 25, 2013)
|
||||||
|
|
||||||
|
|
|
@ -297,8 +297,14 @@ module VagrantPlugins
|
||||||
# Validate networks
|
# Validate networks
|
||||||
has_fp_port_error = false
|
has_fp_port_error = false
|
||||||
fp_host_ports = Set.new
|
fp_host_ports = Set.new
|
||||||
|
valid_network_types = [:forwarded_port, :private_network, :public_network]
|
||||||
|
|
||||||
networks.each do |type, options|
|
networks.each do |type, options|
|
||||||
|
if !valid_network_types.include?(type)
|
||||||
|
errors << I18n.t("vagrant.config.vm.network_type_invalid",
|
||||||
|
:type => type.to_s)
|
||||||
|
end
|
||||||
|
|
||||||
if type == :forwarded_port
|
if type == :forwarded_port
|
||||||
if !has_fp_port_error && (!options[:guest] || !options[:host])
|
if !has_fp_port_error && (!options[:guest] || !options[:host])
|
||||||
errors << I18n.t("vagrant.config.vm.network_fp_requires_ports")
|
errors << I18n.t("vagrant.config.vm.network_fp_requires_ports")
|
||||||
|
|
|
@ -494,6 +494,8 @@ en:
|
||||||
Forwarded port '%{host}' (host port) is declared multiple times
|
Forwarded port '%{host}' (host port) is declared multiple times
|
||||||
network_fp_requires_ports: |-
|
network_fp_requires_ports: |-
|
||||||
Forwarded port definitions require a "host" and "guest" value
|
Forwarded port definitions require a "host" and "guest" value
|
||||||
|
network_type_invalid: |-
|
||||||
|
Network type '%{type}' is invalid. Please use a valid network type.
|
||||||
provisioner_not_found: |-
|
provisioner_not_found: |-
|
||||||
The '%{name}' provisioner could not be found.
|
The '%{name}' provisioner could not be found.
|
||||||
shared_folder_guestpath_duplicate: |-
|
shared_folder_guestpath_duplicate: |-
|
||||||
|
|
Loading…
Reference in New Issue