From 4d4bba119a12a6d059e0747d0f91a68eaa75e092 Mon Sep 17 00:00:00 2001 From: Ben Hines Date: Tue, 28 Jul 2015 12:20:30 -0700 Subject: [PATCH] Correct some upstream errors --- plugins/provisioners/puppet/config/puppet.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb index 42815a5f6..185745675 100644 --- a/plugins/provisioners/puppet/config/puppet.rb +++ b/plugins/provisioners/puppet/config/puppet.rb @@ -33,7 +33,7 @@ module VagrantPlugins @module_path = UNSET_VALUE @options = [] @facter = {} - @structured_facts = UNSET_VALUE + @structured_facts = UNSET_VALUE @synced_folder_type = UNSET_VALUE @temp_dir = UNSET_VALUE @working_directory = UNSET_VALUE @@ -54,9 +54,6 @@ module VagrantPlugins def merge(other) super.tap do |result| result.facter = @facter.merge(other.facter) - result.structured_facts = @facter.merge(other.structured_facts) - result.environment_path = @facter.merge(other.environment_path) - result.environment = @facter.merge(other.environment) end end @@ -146,7 +143,7 @@ module VagrantPlugins if !expanded_environment_file.file? && !expanded_environment_file.directory? errors << I18n.t("vagrant.provisioners.puppet.environment_missing", environment: environment.to_s, - environment_path: expanded_path.to_s) + environmentpath: expanded_path.to_s) end end end