launchpad-reviewers team mailing list archive

[Matthew Revell <matthew.revell@xxxxxxxxxxxxx>]

Matthew Revell has proposed merging lp:~matthew.revell/maas/maas-key-explanation into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~matthew.revell/maas/maas-key-explanation/+merge/102657

Rewrite of the README to better describe MAAS.

Also adds a note to the user prefs key to explain why you might want more than one MAAS key.
-- 
https://code.launchpad.net/~matthew.revell/maas/maas-key-explanation/+merge/102657
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~matthew.revell/maas/maas-key-explanation into lp:maas.

=== modified file 'README.txt'
--- README.txt	2012-04-11 12:50:17 +0000
+++ README.txt	2012-04-19 09:57:21 +0000
@@ -1,18 +1,17 @@
 .. -*- mode: rst -*-
 
-****
-MAAS
-****
-
-MAAS is the successor to Orchestra. It offers a nice UI to provision your
-Ubuntu servers. Each physical server (“node”) will
-be commissioned automatically on first boot. During the commissioning
-process administrators are able to configure hardware settings
-manually before an automated smoke test and burn-in test are
-done. Once commissioned, a node can be deployed on demand by name, or
-allocated to a queue for dynamic allocation to services being deployed
-on this MAAS.
-
-For more information see `MAAS on Launchpad`_.
-
-.. _MAAS on Launchpad: https://launchpad.net/maas
+************************
+MAAS: Metal as a Service
+************************
+
+Metal as a Service -- MAAS -- lets you treat physical servers like virtual machines in the cloud. Rather than having to manage each server individually, MAAS turns your bare metal into an elastic cloud-like resource.
+
+What does that mean in practice? Tell MAAS about the machines you want it to manage and it will boot them, check the hardware's okay, and have them waiting for when you need them. You can then pull nodes up, tear them down and redeploy them at will; just as you can with virtual machines in the cloud.
+
+When you're ready to deploy a service, MAAS gives Juju the nodes it needs to power that service. It's as simple as that: no need to manually provision, check and, afterwards, clean-up. As your needs change, you can easily scale servics up or down. Need more power for your Hadoop cluster for a few hours? Simply tear down one of your Nova compute nodes and redeploy it to Hadoop. When you're done, it's just as easy to give the node back to Nova.
+
+MAAS is ideal where you want the flexibility of the cloud, and the hassle-free power of Juju charms, but you need to deploy to bare metal.
+
+For more information see the `MAAS guide`_.
+
+.. _MAAS guide: https://wiki.ubuntu.com/ServerTeam/MAAS

=== modified file 'src/maasserver/templates/maasserver/prefs.html'
--- src/maasserver/templates/maasserver/prefs.html	2012-04-05 06:23:59 +0000
+++ src/maasserver/templates/maasserver/prefs.html	2012-04-19 09:57:21 +0000
@@ -22,6 +22,7 @@
       <h2>Keys</h2>
       <h3>MAAS keys</h3>
       <div id="api">
+      <p>You'll need a separate MAAS key for each Juju environment.</p>
       <ul class="list">
         {% for token in user.get_profile.get_authorisation_tokens %}
           <li class="bundle">