Set up multi VM test environment

README.md

 Adblock Plus infrastructure
 ===========================
 
 The new Adblock Plus infrastructure uses
 [Puppet](http://puppetlabs.com/) to set up and configure our nodes,
 and to have realistic test environments for infrastructure components.
 
 Our Puppet manifests are only tested with Ubuntu 12.04 right now.
 
 Development environment
 -----------------------
 
 With the new infrastructure, any work we do on our systems or
 infrastructure components should be done in a local test
 environment. Thanks to Puppet, we can easily set up local VMs just
 like our production environments.
 
 The most convenient way to do this is to use Vagrant, as described
 below.
 
 ### Requirements
 
 * [VirtualBox](https://www.virtualbox.org/)
 * [Vagrant](http://vagrantup.com/)
 
-### Set up the server
+### Start a VM
 
-All you have to do is start _Vagrant_ (that's going to take a while on
-first boot):
+Right now, there's only one VM called _webserver_, but we'll have one
+for each type of server we manage in the future.
 
-    vagrant up
+To start the _webserver_ VM:
+
+    vagrant up webserver
 
 After you've made changes to Puppet manifests, you can update it like this:
 
-        vagrant provision
+        vagrant provision webserver
 
 Website development
 -------------------
 
 ### Requirements
 
-* Make sure the _adblockplusorg_ module is included in _vagrant.pp_.
 * A clone of the _anwiki_ repository, next to this directory.
+* The running _webserver_ VM.
 
 ### Set up anwiki
 
 1. Go to [http://10.8.0.97](http://10.8.0.97).
 
 2. Click on the green _Begin installation_ button.
 
 3. Enter _http://10.8.0.97/_ as _Root URL_ and empty the _Cookies
 domain_ field.
 
@@ skipping 30 matching lines @@
 
     vagrant ssh
 
 Then execute the following:
 
     sudo deploy-anwiki
 
 If you have a clone of anwiki (see _Requirements_), this will deploy
 it on the virtual machine. If not, it will clone anwiki from the
 official repository.