Skip to content

Commit

Permalink
Merge pull request #1420 from roots/update-vagrant-version-constraints
Browse files Browse the repository at this point in the history
Update Vagrant required version
  • Loading branch information
swalkinshaw authored Aug 10, 2022
2 parents 8b9b973 + 19c5abb commit 351748a
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 351748a

Please sign in to comment.