Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154975
Change subject: Use the largest of all configured vagrant_ram values
......................................................................
Use the largest of all configured vagrant_ram values
Modified the coercion lambda for vagrant_ram to take the larger of the
new value and the currently configured one (as opposed to just the
new or the default).
Fixed config command to unset the old value before parsing the new so
that local values for settings such as vagrant_ram can be lowered by
re-running `vagrant config`.
Change-Id: I280f85ba70bf818b4a917e902d32b574b200f287
---
M lib/mediawiki-vagrant/config.rb
M lib/mediawiki-vagrant/settings/definitions.rb
2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/75/154975/1
diff --git a/lib/mediawiki-vagrant/config.rb b/lib/mediawiki-vagrant/config.rb
index 7dd1dc9..0e98f1d 100644
--- a/lib/mediawiki-vagrant/config.rb
+++ b/lib/mediawiki-vagrant/config.rb
@@ -77,7 +77,10 @@
# Configures the given setting with the given value.
#
def configure_setting(name, value)
- configure { |settings| settings[name] =
parse_setting(settings.setting(name), value) }
+ configure do |settings|
+ settings.unset!(name)
+ settings[name] = parse_setting(settings.setting(name), value)
+ end
end
# Displays current values for the given settings.
diff --git a/lib/mediawiki-vagrant/settings/definitions.rb
b/lib/mediawiki-vagrant/settings/definitions.rb
index 96b07b4..773c041 100644
--- a/lib/mediawiki-vagrant/settings/definitions.rb
+++ b/lib/mediawiki-vagrant/settings/definitions.rb
@@ -10,7 +10,7 @@
description: "Amount of RAM (in MB) allocated to the guest VM",
help: "Tasks such as browser tests may require more memory (minimum of
1024)",
default: 1024,
- coercion: ->(setting, new) { [setting.default, new.to_i].max }
+ coercion: ->(setting, new) { [setting.value, new.to_i].max }
setting :vagrant_cores,
description: "CPU cores allocated to the guest VM",
--
To view, visit https://gerrit.wikimedia.org/r/154975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I280f85ba70bf818b4a917e902d32b574b200f287
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
