Browse code

Bump Vagrant machine RAM requirement

We're now running out of memory building OpenShift in the latest
F23 vagrant image. 3072 was chosen because it matches the DIND
requirement mentioned in CONTRIBUTING.

Dan Williams authored on 2016/02/26 03:39:30
Showing 2 changed files
... ...
@@ -240,8 +240,6 @@ use cases.
240 240
 To run a dind cluster in a VM, follow steps 1-3 of the Vagrant
241 241
 instructions and then execute the following:
242 242
 
243
-        # Extra memory is required to build the extended tests
244
-        $ export OPENSHIFT_MEMORY=3072
245 243
         $ export OPENSHIFT_DIND_DEV_CLUSTER=true
246 244
         $ vagrant up
247 245
 
... ...
@@ -54,7 +54,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
54 54
     "num_minions"       => ENV['OPENSHIFT_NUM_MINIONS'] || 2,
55 55
     "rebuild_yum_cache" => false,
56 56
     "cpus"              => ENV['OPENSHIFT_NUM_CPUS'] || 2,
57
-    "memory"            => ENV['OPENSHIFT_MEMORY'] || 2560,
57
+    "memory"            => ENV['OPENSHIFT_MEMORY'] || 3072,
58 58
     "fixup_net_udev"    => ENV['OPENSHIFT_FIXUP_NET_UDEV'] || true,
59 59
     "skip_build"        => ENV['OPENSHIFT_SKIP_BUILD'] || false,
60 60
     "sync_folders_type" => nil,