launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/docs-bug-1136065 into lp:maas.

Commit message:
Fix the juju quick start docs so that they don't refer to outdated non-package installations.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1136065 in MAAS: "maas juju quick start maas-server: url unclear"
  https://bugs.launchpad.net/maas/+bug/1136065

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/docs-bug-1136065/+merge/151126


-- 
https://code.launchpad.net/~julian-edwards/maas/docs-bug-1136065/+merge/151126
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/docs-bug-1136065 into lp:maas.

=== modified file 'docs/juju-quick-start.rst'
--- docs/juju-quick-start.rst	2012-11-20 21:46:37 +0000
+++ docs/juju-quick-start.rst	2013-03-01 00:15:27 +0000
@@ -12,15 +12,6 @@
 - You're running MAAS on your local machine. If not you'll need to
   adjust some of the URLs mentioned accordingly.
 
-- You're running Juju from the PPA (``ppa:juju/pkgs``) or from a
-  branch of ``lp:juju``. At the time of writing MAAS support had not
-  made it into the main Ubuntu archives. However, following the
-  release of Ubuntu Precise, all the necessary package revisions will
-  be in main.
-
-  If you're using a branch, note that you'll need to set
-  ``PYTHONPATH`` carefully to ensure you use the code in the branch.
-
 
 Your API key, SSH key, and environments.yaml
 --------------------------------------------
@@ -46,8 +37,8 @@
 #. Optionally add a new MAAS key. Do this if you're setting up another
    environment within the same MAAS cluster.
 
-.. _MAAS preferences page: http://localhost:5240/account/prefs/
-.. _MAAS home page: http://localhost:5240/
+.. _MAAS preferences page: http://localhost/MAAS/account/prefs/
+.. _MAAS home page: http://localhost/MAAS
 
 
 Adding an SSH key
@@ -68,14 +59,12 @@
   environments:
     maas:
       type: maas
-      maas-server: 'http://localhost:5240'
+      maas-server: 'http://localhost/MAAS'
       maas-oauth: '${maas-api-key}'
       admin-secret: 'nothing'
 
 Substitute the API key from earlier into the ``${maas-api-key}``
-slot. You may need to modify the ``maas-server`` setting too; if
-you're running from the maas package it should be something like
-``http://hostname.example.com/MAAS``.
+slot.
 
 
 Now Juju

=== modified file 'src/metadataserver/commissioning/tests/test_user_data.py'
--- src/metadataserver/commissioning/tests/test_user_data.py	2013-02-12 01:51:21 +0000
+++ src/metadataserver/commissioning/tests/test_user_data.py	2013-03-01 00:15:27 +0000
@@ -70,6 +70,7 @@
     def test_generate_user_data_produces_commissioning_script(self):
         # generate_user_data produces a commissioning script which contains
         # both definitions and use of various commands in python.
+        import pdb; pdb.set_trace()
         self.assertThat(
             generate_user_data(), ContainsAll({
                 'maas-get',