Rewrite README

2 files changed, 35 insertions, 22 deletions

diff --git a/README b/README
index 8ea9407..bdb4f58 100644
--- a/README
+++ b/README
@@ -1,4 +1,32 @@
-= Tips about setting up a kvm slave =
+= Master and slaves management =
+
+Let's start with an example. First create all the slaves
+
+    fab slave.create
+
+Then create the master
+
+    fab master.create
+
+And configure it
+
+    fab master.configure
+
+Finally run the master and the slaves
+
+    fab master.run slave.run
+
+All done!
+
+For more advanced usage see the fabric documentation
+http://docs.fabfile.org/en/1.5/usage/fab.html
+
+= Slave requirements =
+
+* buildbot user with passwordless, ttyless sudo access.
+* git, virtualenv, gcc, make
+
+= Creating a kvm slave =
 
 You can create an image with something like this:
 
@@ -9,21 +37,6 @@ You can create an image with something like this:
         --location "http://mirror.foo.com/..." \
         --extra-args="text serial console=ttyS0,115200"
 
-Once the system is running you need to:
-
-* Add a buildbot user
-* Add buildbot to the wheel (Fedora) or sudo (Ubuntu) group
-
-    gpassword --add buildbot wheel
-
-* Run visudo and make sure "Default requiretty" is commented out
-* Still in visudo, allow to run without a password. Something like
-
-    %wheel ALL=(ALL) NOPASSWD: ALL
-
-* Install virtualenv, git, gcc and make. You don't need to update the system,
-the buildbot will take care of it.
-
 = Bug reports =
 
 Send bug reports to Daniel Narvaez <dwnarvaez@gmail.com>.
diff --git a/fabfile/slave.py b/fabfile/slave.py
index 6e1e791..fda98b6 100644
--- a/fabfile/slave.py
+++ b/fabfile/slave.py
@@ -12,12 +12,12 @@ from fabric.api import roles
 from fabric.api import with_settings 
 
 slaves = {"buildbot@debian-wheezy-32bit.local": "debian-wheezy-32bit",
-          #"buildbot@debian-wheezy-64bit.local": "debian-wheezy-64bit",
-          #"buildbot@fedora-17-32bit.local": "fedora-17-32bit",
-          #"buildbot@fedora-17-64bit.local": "fedora-17-64bit",
-          #"buildbot@fedora-18-32bit.local": "fedora-18-32bit",
-          #"buildbot@fedora-18-64bit.local": "fedora-18-64bit",
-          #"buildbot@ubuntu-12-10-32bit.local": "ubuntu-12-10-32bit",
+          "buildbot@debian-wheezy-64bit.local": "debian-wheezy-64bit",
+          "buildbot@fedora-17-32bit.local": "fedora-17-32bit",
+          "buildbot@fedora-17-64bit.local": "fedora-17-64bit",
+          "buildbot@fedora-18-32bit.local": "fedora-18-32bit",
+          "buildbot@fedora-18-64bit.local": "fedora-18-64bit",
+          "buildbot@ubuntu-12-10-32bit.local": "ubuntu-12-10-32bit",
           "buildbot@ubuntu-12-10-64bit.local": "ubuntu-12-10-64bit"}
 
 slave_gateway = "dnarvaez@bender.sugarlabs.org"