Tim Landscheidt has uploaded a new change for review. https://gerrit.wikimedia.org/r/280786
Change subject: Add setting nfs_force_v3 to force NFS 3 ...................................................................... Add setting nfs_force_v3 to force NFS 3 Change-Id: Ie6a28e128ee06a3b2a02d0b8c83dff2b62050e26 --- M Gemfile.lock M Vagrantfile M features/config.feature M lib/mediawiki-vagrant/settings/definitions.rb M lib/mediawiki-vagrant/version.rb M spec/mediawiki_vagrant/settings/definitions_spec.rb 6 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/86/280786/1 diff --git a/Gemfile.lock b/Gemfile.lock index 8a3a135..24b53e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,7 +24,7 @@ PATH remote: . specs: - mediawiki-vagrant (0.13.0) + mediawiki-vagrant (0.14.0) GEM remote: https://rubygems.org/ diff --git a/Vagrantfile b/Vagrantfile index 7d798cd..93ff0bb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -145,6 +145,7 @@ root_share_options[:type] = :nfs root_share_options[:mount_options] = ['noatime', 'rsize=32767', 'wsize=32767', 'async'] root_share_options[:mount_options] << 'fsc' if settings[:nfs_cache] + root_share_options[:mount_options] << 'vers=3' if settings[:nfs_force_v3] config.nfs.map_uid = Process.uid config.nfs.map_gid = Process.gid else diff --git a/features/config.feature b/features/config.feature index 2d002aa..2231923 100644 --- a/features/config.feature +++ b/features/config.feature @@ -29,6 +29,7 @@ | http_port | | https_port | | nfs_shares | + | nfs_force_v3 | | forward_agent | | forward_x11 | @@ -77,6 +78,7 @@ | https_port | 4433 | | host_ip | 0.0.0.0 | | nfs_shares | no | + | nfs_force_v3 | no | | nfs_cache | yes | | forward_agent | yes | | forward_x11 | no | @@ -90,6 +92,7 @@ | https_port | 4433 | | host_ip | 0.0.0.0 | | nfs_shares | no | + | nfs_force_v3 | no | | nfs_cache | yes | | forward_agent | yes | | forward_x11 | no | diff --git a/lib/mediawiki-vagrant/settings/definitions.rb b/lib/mediawiki-vagrant/settings/definitions.rb index 38917c4..b2952e5 100644 --- a/lib/mediawiki-vagrant/settings/definitions.rb +++ b/lib/mediawiki-vagrant/settings/definitions.rb @@ -47,6 +47,12 @@ default: defined?(Vagrant::Util::Platform) ? !Vagrant::Util::Platform.windows? : true, coercion: ->(_setting, new) { !!(new.to_s =~ /^(true|t|yes|y|1)$/i) } + setting :nfs_force_v3, + description: 'Use NFS version 3', + help: "Enter 'yes' or 'no'.", + default: false, + coercion: ->(_setting, new) { !!(new.to_s =~ /^(true|t|yes|y|1)$/i) } + setting :nfs_cache, description: 'Use cachefilesd to speed up NFS file access (EXPERIMENTAL)', help: "Enter 'yes' or 'no'. If your VM is currently running, reload it after changing this setting.", diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb index 93797c0..f401f2b 100644 --- a/lib/mediawiki-vagrant/version.rb +++ b/lib/mediawiki-vagrant/version.rb @@ -1,3 +1,3 @@ module MediaWikiVagrant - VERSION = '0.13.0' + VERSION = '0.14.0' end diff --git a/spec/mediawiki_vagrant/settings/definitions_spec.rb b/spec/mediawiki_vagrant/settings/definitions_spec.rb index c4232be..cfa59a0 100644 --- a/spec/mediawiki_vagrant/settings/definitions_spec.rb +++ b/spec/mediawiki_vagrant/settings/definitions_spec.rb @@ -127,6 +127,26 @@ end end + describe 'nfs_force_v3' do + subject { definitions[:nfs_force_v3] } + + context 'when a new value is set' do + it 'considers values "true", "t", "yes", "y", "1" all to be true' do + %w(true t yes y 1).each do |value| + subject.value = value + expect(subject.value).to be(true), "expected #{value} to be considered true" + end + end + + it 'considers values "false", "f", "no", "n", "0" to be false' do + %w(false f no n 0).each do |value| + subject.value = value + expect(subject.value).to be(false), "expected #{value} to be considered false" + end + end + end + end + describe 'forward_agent' do subject { definitions[:forward_agent] } -- To view, visit https://gerrit.wikimedia.org/r/280786 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6a28e128ee06a3b2a02d0b8c83dff2b62050e26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
