provisioners/salt: deprecate config_dir
This commit is contained in:
parent
6c250d023e
commit
fedc7e21b3
|
@ -15,13 +15,15 @@ FEATURES:
|
|||
|
||||
BREAKING CHANGES:
|
||||
|
||||
- the `ansible` provisioner now can override the effective ansible remote user
|
||||
- The `ansible` provisioner now can override the effective ansible remote user
|
||||
(i.e. `ansible_ssh_user` setting) to always correspond to the vagrant ssh
|
||||
username. This change is enabled by default, but we expect this to affect
|
||||
only a tiny number of people as it corresponds to the common usage.
|
||||
If you however use multiple remote usernames in your Ansible plays, tasks,
|
||||
or custom inventories, you can simply set the option `force_remote_user` to
|
||||
false to make Vagrant behave the same as before.
|
||||
- provisioners/salt: the "config_dir" option has been removed. It has no
|
||||
effect in Vagrant 1.8. [GH-6073]
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
|
|
|
@ -4,6 +4,10 @@ require "vagrant/util/deep_merge"
|
|||
module VagrantPlugins
|
||||
module Salt
|
||||
class Config < Vagrant.plugin("2", :config)
|
||||
## @deprecated
|
||||
def config_dir=(value)
|
||||
puts "salt config_dir is deprecated and will be removed in Vagrant 1.9"
|
||||
end
|
||||
|
||||
## salty-vagrant options
|
||||
attr_accessor :minion_config
|
||||
|
|
|
@ -16,6 +16,12 @@ describe VagrantPlugins::Salt::Config do
|
|||
|
||||
let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
|
||||
|
||||
describe "#config_dir" do
|
||||
it "is deprecated until Vagrant 1.9" do
|
||||
raise "Remove the deprecation" if Vagrant::VERSION >= "1.9.0"
|
||||
end
|
||||
end
|
||||
|
||||
describe "validate" do
|
||||
let(:error_key) { "salt provisioner" }
|
||||
|
||||
|
|
Loading…
Reference in New Issue