Merge lp:~frankban/juju-gui/quickstart-instructions into lp:juju-gui/experimental

[Francesco Banconi]

Update bundle quickstart instructions,

https://codereview.appspot.com/25950043/

[Francesco Banconi (frankban)]

Reviewers: mp+195020_code.launchpad.net,

Message:
Please take a look.

Description:
Update bundle quickstart instructions,

https://code.launchpad.net/~frankban/juju-gui/quickstart-instructions/+merge/195020

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/25950043/

Affected files (+5, -4 lines):
   A [revision details]
   M app/templates/bundle.handlebars

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision:
<email address hidden>

Index: app/templates/bundle.handlebars
=== modified file 'app/templates/bundle.handlebars'
--- app/templates/bundle.handlebars 2013-11-12 14:28:46 +0000
+++ app/templates/bundle.handlebars 2013-11-13 10:06:38 +0000
@@ -72,10 +72,9 @@
                          <pre>sudo apt-get update</pre>
                          <pre>sudo apt-get install juju-quickstart</pre>
                      </p>
- <p>Step 2 - Download and deploy bundle
- <pre>wget -O bundle.json \</pre>
- <pre> {{deployer_file_url}}</pre>
- <pre>juju quickstart bundle.json</pre></p>
+ <p>Step 2 - Deploy bundle
+ <pre>juju quickstart {{permanent_url}} [-e
&lt;JUJU_ENV&gt;]</pre>
+ </p>
                      <h3>Deploy via the deployer</h3>
                      <p>The Juju deployer is a tool that the quickstart
plugin (above) uses. It can also be used standalone to give you more
control.</p>
                      <p>Step 1 - Install the deployer

[Gary Poster (gary)]

LGTM given consideration of the comment. Thank you!

https://codereview.appspot.com/25950043/diff/1/app/templates/bundle.handlebars
File app/templates/bundle.handlebars (right):

https://codereview.appspot.com/25950043/diff/1/app/templates/bundle.handlebars#newcode76
app/templates/bundle.handlebars:76: <pre>juju quickstart
{{permanent_url}} [-e &lt;JUJU_ENV&gt;]</pre>
Can the optional -e really come after the positional argument? I would
have guessed that it needs to come before, and that's certainly more
typical.

https://codereview.appspot.com/25950043/

[Francesco Banconi (frankban)]

*** Submitted:

Update bundle quickstart instructions,

R=gary.poster
CC=
https://codereview.appspot.com/25950043

https://codereview.appspot.com/25950043/

[Francesco Banconi (frankban)]

On 2013/11/13 13:33:32, gary.poster wrote:

https://codereview.appspot.com/25950043/diff/1/app/templates/bundle.handlebars#newcode76
> app/templates/bundle.handlebars:76: <pre>juju quickstart
{{permanent_url}} [-e
> &lt;JUJU_ENV&gt;]</pre>
> Can the optional -e really come after the positional argument? I
would have
> guessed that it needs to come before, and that's certainly more
typical.

As mentioned on IRC, the -e argument can come before or after,
I put that after just to make copy/paste easier for users which already
have a default env.

Thanks for the review!

https://codereview.appspot.com/25950043/

=== modified file 'app/templates/bundle.handlebars'
--- app/templates/bundle.handlebars	2013-11-12 14:28:46 +0000
+++ app/templates/bundle.handlebars	2013-11-13 10:11:21 +0000
@@ -72,10 +72,9 @@
                         <pre>sudo apt-get update</pre>
                         <pre>sudo apt-get install juju-quickstart</pre>
                     </p>
-                    <p>Step 2 - Download and deploy bundle
-                        <pre>wget -O bundle.json \</pre>
-                        <pre>    {{deployer_file_url}}</pre>
-                        <pre>juju quickstart bundle.json</pre></p>
+                    <p>Step 2 - Deploy bundle
+                        <pre>juju quickstart {{permanent_url}} [-e &lt;JUJU_ENV&gt;]</pre>
+                    </p>
                     <h3>Deploy via the deployer</h3>
                     <p>The Juju deployer is a tool that the quickstart plugin (above) uses.  It can also be used standalone to give you more control.</p>
                     <p>Step 1 - Install the deployer