Skip to content

Commit

Permalink
Fix broken masterless minion configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@driskell
driskell committed Aug 3, 2015
1 parent 8045869 commit ff941ef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion plugins/provisioners/salt/provisioner.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def bootstrap_options(install, configure, config_dir)
options = "%s %s" % [options, @config.bootstrap_options]
end

if configure && !@machine.config.vm.communicator == :winrm
if configure && @machine.config.vm.communicator != :winrm
options = "%s -F -c %s" % [options, config_dir]
end

Expand Down

2 comments on commit ff941ef

@kevich
Copy link

@kevich kevich commented on ff941ef Sep 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, @mitchellh when this commit will be in release? That bug really made my night, when I was trying to figure out why again my vagrant fault to start

@abo-adapt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This bug also bit me, as it meant the master_config config option does not work. Any chance it might be in a release soon?

Please sign in to comment.