haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct environment path config name.

This commit is contained in:
Ben Hines 2015-04-11 23:48:18 -07:00
parent 3a2a9a3b94
commit e2c68fc12d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -32,11 +32,11 @@ module VagrantPlugins
folder_opts[:type] = @config.synced_folder_type if @config.synced_folder_type folder_opts[:type] = @config.synced_folder_type if @config.synced_folder_type
folder_opts[:owner] = "root" if !@config.synced_folder_type folder_opts[:owner] = "root" if !@config.synced_folder_type
if @config.environmentpath.is_a?(Array) if @config.environment_path.is_a?(Array)
# Share the environments directory with the guest # Share the environments directory with the guest
if @config.environmentpath[0].to_sym == :host if @config.environment_path[0].to_sym == :host
root_config.vm.synced_folder( root_config.vm.synced_folder(
File.expand_path(@config.environmentpath[1], root_path), File.expand_path(@config.environment_path[1], root_path),
environments_guest_path, folder_opts) environments_guest_path, folder_opts)
end end
parse_environment_metadata() parse_environment_metadata()
@ -87,7 +87,7 @@ module VagrantPlugins
if @config.manifests_path.is_a?(Array) && @config.manifests_path[0] == :host if @config.manifests_path.is_a?(Array) && @config.manifests_path[0] == :host
check << manifests_guest_path check << manifests_guest_path
end end
if @config.environmentpath.is_a?(Array) && @config.environmentpath[0] == :host if @config.environment_path.is_a?(Array) && @config.environment_path[0] == :host
check << environments_guest_path check << environments_guest_path
end end
@module_paths.each do |host_path, guest_path| @module_paths.each do |host_path, guest_path|
@ -129,12 +129,12 @@ module VagrantPlugins
end end
def environments_guest_path def environments_guest_path
if config.environmentpath[0] == :host if config.environment_path[0] == :host
# The path is on the host, so point to where it is shared # The path is on the host, so point to where it is shared
File.join(config.temp_dir, "environments") File.join(config.temp_dir, "environments")
else else
# The path is on the VM, so just point directly to it # The path is on the VM, so just point directly to it
config.environmentpath[1] config.environment_path[1]
end end
end end
@ -184,7 +184,7 @@ module VagrantPlugins
options << "--detailed-exitcodes" options << "--detailed-exitcodes"
if !config.environmentpath.empty? if !config.environment_path.empty?
options << "#{environments_guest_path}/#{@config.environment}/manifests" options << "#{environments_guest_path}/#{@config.environment}/manifests"
options << "--environment #{@config.environment}" options << "--environment #{@config.environment}"
else else
@ -220,7 +220,7 @@ module VagrantPlugins
end end
end end
if !config.environmentpath.empty? if !config.environment_path.empty?
@machine.ui.info(I18n.t( @machine.ui.info(I18n.t(
"vagrant.provisioners.puppet.running_puppet_env", "vagrant.provisioners.puppet.running_puppet_env",
environment: config.environment)) environment: config.environment))