launchpad-reviewers team mailing list archive

[Colin Watson <mp+445415@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/turnip:doc-mojo into turnip:master.

Commit message:
doc: Refer to launchpad-mojo-specs for charmed deployments

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/445415
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:doc-mojo into turnip:master.

diff --git a/charm/README.md b/charm/README.md
index 0bc4a18..57782e9 100644
--- a/charm/README.md
+++ b/charm/README.md
@@ -6,11 +6,12 @@ Pyramid.
 
 # Usage
 
-    $ juju add-model turnip
-    $ make deploy PIP_SOURCE_DIR=/path/to/dependencies
+The simplest way to deploy the full charmed stack is by using the [Mojo
+spec](https://git.launchpad.net/launchpad-mojo-specs/tree/lp-git/README.md).
+If you can't do that for some reason, then read on.
 
-... where `/path/to/dependencies` is the path to a clone of
-https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies.
+    $ juju add-model turnip
+    $ make deploy
 
 This will deploy Turnip itself, but it must be linked to a separate service
 that defines things like how to translate repository paths, how to
@@ -19,7 +20,7 @@ authenticate users, and so on.  This may be Launchpad or the stub
 
     $ git clone https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/turnipcake
     $ cd turnipcake/charm
-    $ make deploy PIP_SOURCE_DIR=/path/to/dependencies
+    $ make deploy
     $ juju add-relation turnip-api turnipcake
     $ juju add-relation haproxy turnipcake:turnipcake
     $ HAPROXY_ADDRESS="$(juju status --format=json haproxy | jq -r '.applications.haproxy.units[]."public-address"')"
diff --git a/docs/deployment.rst b/docs/deployment.rst
index 2b97597..146382f 100644
--- a/docs/deployment.rst
+++ b/docs/deployment.rst
@@ -2,4 +2,4 @@ Deployment
 ==========
 
 Turnip is deployed with its own set of charms.
-See charm/README.md in the source tree.
+See https://git.launchpad.net/launchpad-mojo-specs/tree/lp-git/README.md.