Merge lp:~gary/juju-gui/bug1249509 into lp:juju-gui/experimental

[Gary Poster]

Tweak text about juju deployer

To QA, go to a bundle in the charm browser, click on deploy tab, and look at the deployer section and make sure it looks and reads OK.

https://codereview.appspot.com/25220043/

[Gary Poster (gary)]

Reviewers: mp+194869_code.launchpad.net,

Message:
Please take a look.

Description:
Tweak text about juju deployer

To QA, go to a bundle in the charm browser, click on deploy tab, and
look at the deployer section and make sure it looks and reads OK.

https://code.launchpad.net/~gary/juju-gui/bug1249509/+merge/194869

(do not edit description out of merge proposal)

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

Affected files (+8, -5 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-06 01:50:01 +0000
+++ app/templates/bundle.handlebars 2013-11-12 14:28:46 +0000
@@ -77,13 +77,14 @@
                          <pre> {{deployer_file_url}}</pre>
                          <pre>juju quickstart bundle.json</pre></p>
                      <h3>Deploy via the deployer</h3>
- <p>Step 1 - Setup the virtual environment
- <pre>virtualenv --system-site-packages
deployer</pre>
- <pre>./deployer/bin/easy_install
juju-deployer</pre>
- <pre>./deployer/bin/juju-deployer -h</pre>
+ <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
+ <pre>sudo add-apt-repository ppa:juju/stable</pre>
+ <pre>sudo apt-get update</pre>
+ <pre>sudo apt-get install juju-deployer</pre>
                      </p>
                      <p>Step 2 - Deploy bundle
- <pre>./deployer/bin/juju-deployer -e
&lt;JUJU_ENV&gt; -c \</pre>
+ <pre>juju deployer -e &lt;JUJU_ENV&gt; -c \</pre>
                          <pre> {{deployer_file_url}}</pre></p>
                  </div>
                  <div id="bws-summary">

[Richard Harding (rharding)]

LGTM QA ok

https://codereview.appspot.com/25220043/

[Gary Poster (gary)]

*** Submitted:

Tweak text about juju deployer

To QA, go to a bundle in the charm browser, click on deploy tab, and
look at the deployer section and make sure it looks and reads OK.

R=rharding
CC=
https://codereview.appspot.com/25220043

https://codereview.appspot.com/25220043/

=== modified file 'app/templates/bundle.handlebars'
--- app/templates/bundle.handlebars	2013-11-06 01:50:01 +0000
+++ app/templates/bundle.handlebars	2013-11-12 14:32:43 +0000
@@ -77,13 +77,14 @@
                         <pre>    {{deployer_file_url}}</pre>
                         <pre>juju quickstart bundle.json</pre></p>
                     <h3>Deploy via the deployer</h3>
-                    <p>Step 1 - Setup the virtual environment
-                        <pre>virtualenv --system-site-packages deployer</pre>
-                        <pre>./deployer/bin/easy_install juju-deployer</pre>
-                        <pre>./deployer/bin/juju-deployer -h</pre>
+                    <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
+                        <pre>sudo add-apt-repository ppa:juju/stable</pre>
+                        <pre>sudo apt-get update</pre>
+                        <pre>sudo apt-get install juju-deployer</pre>
                     </p>
                     <p>Step 2 - Deploy bundle
-                        <pre>./deployer/bin/juju-deployer -e &lt;JUJU_ENV&gt; -c \</pre>
+                        <pre>juju deployer -e &lt;JUJU_ENV&gt; -c \</pre>
                         <pre>    {{deployer_file_url}}</pre></p>
                 </div>
                 <div id="bws-summary">