Skip to content

Commit

Permalink
Update Vagrant required version
Browse files Browse the repository at this point in the history
Now that Vagrant 2.3.0, we can drop the exception for the broken 2.2.19
release.

This also removes the platform check and introduces a new
`vagrant_require_version` config setting. This makes it easier to
override the version constraint in a local config if need be without
changing the `Vagrantfile`.
  • Loading branch information
swalkinshaw committed Aug 10, 2022
1 parent 8b9b973 commit 19c5abb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@ ensure_plugins(vconfig.fetch('vagrant_plugins')) if vconfig.fetch('vagrant_insta

trellis_config = Trellis::Config.new(root_path: ANSIBLE_PATH)

if Vagrant::Util::Platform.darwin?
Vagrant.require_version '>= 2.1.0', '< 2.2.19'
else
Vagrant.require_version '>= 2.1.0'
end

Vagrant.require_version vconfig.fetch('vagrant_require_version', '>= 2.1.0')

Vagrant.configure('2') do |config|
config.vm.box = vconfig.fetch('vagrant_box')
config.vm.box_version = vconfig.fetch('vagrant_box_version')
Expand Down
1 change: 1 addition & 0 deletions vagrant.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ vagrant_box_version: '>= 202012.23.0'
vagrant_ansible_version: '2.10.7'
vagrant_skip_galaxy: false
vagrant_mount_type: 'nfs'
vagrant_require_version: '>= 2.1.0'

vagrant_install_plugins: true
vagrant_plugins:
Expand Down

0 comments on commit 19c5abb

Please sign in to comment.