Don't default config values to nil
This commit is contained in:
parent
5c70dd1658
commit
06d4b6a4e5
|
@ -115,19 +115,8 @@ module Vagrant
|
||||||
attr_writer :run_list
|
attr_writer :run_list
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
@provisioning_path = nil
|
|
||||||
@log_level = :info
|
@log_level = :info
|
||||||
@json = {}
|
@json = {}
|
||||||
@http_proxy = nil
|
|
||||||
@http_proxy_user = nil
|
|
||||||
@http_proxy_pass = nil
|
|
||||||
@https_proxy = nil
|
|
||||||
@https_proxy_user = nil
|
|
||||||
@https_proxy_pass = nil
|
|
||||||
@no_proxy = nil
|
|
||||||
@binary_path = nil
|
|
||||||
@binary_env = nil
|
|
||||||
@run_list = nil
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# This returns the json that is merged with the defaults and the
|
# This returns the json that is merged with the defaults and the
|
||||||
|
|
|
@ -25,7 +25,6 @@ module Vagrant
|
||||||
@client_key_path = "/etc/chef/client.pem"
|
@client_key_path = "/etc/chef/client.pem"
|
||||||
@file_cache_path = "/srv/chef/file_store"
|
@file_cache_path = "/srv/chef/file_store"
|
||||||
@file_backup_path = "/srv/chef/cache"
|
@file_backup_path = "/srv/chef/cache"
|
||||||
@encrypted_data_bag_secret_key_path = nil
|
|
||||||
@encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret"
|
@encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,6 @@ module Vagrant
|
||||||
super
|
super
|
||||||
|
|
||||||
@cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
|
@cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
|
||||||
@roles_path = nil
|
|
||||||
@data_bags_path = nil
|
|
||||||
@nfs = false
|
@nfs = false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@ module Vagrant
|
||||||
def initialize
|
def initialize
|
||||||
@manifest_file = "default.pp"
|
@manifest_file = "default.pp"
|
||||||
@manifests_path = "manifests"
|
@manifests_path = "manifests"
|
||||||
@module_path = nil
|
|
||||||
@pp_path = "/tmp/vagrant-puppet"
|
@pp_path = "/tmp/vagrant-puppet"
|
||||||
@options = []
|
@options = []
|
||||||
end
|
end
|
||||||
|
|
|
@ -10,10 +10,7 @@ module Vagrant
|
||||||
attr_accessor :args
|
attr_accessor :args
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
@inline = nil
|
|
||||||
@path = nil
|
|
||||||
@upload_path = "/tmp/vagrant-shell"
|
@upload_path = "/tmp/vagrant-shell"
|
||||||
@args = nil
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate(env, errors)
|
def validate(env, errors)
|
||||||
|
|
Loading…
Reference in New Issue