Merge lp://staging/~gary/juju-gui/deployTabText into lp://staging/juju-gui/experimental
Proposed by
Gary Poster
Status: | Merged |
---|---|
Merged at revision: | 1181 |
Proposed branch: | lp://staging/~gary/juju-gui/deployTabText |
Merge into: | lp://staging/juju-gui/experimental |
Diff against target: |
66 lines (+18/-11) 3 files modified
app/models/bundle.js (+1/-0) app/subapps/browser/views/bundle.js (+5/-0) app/templates/bundle.handlebars (+12/-11) |
To merge this branch: | bzr merge lp://staging/~gary/juju-gui/deployTabText |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Use the new deployer url in our help text
To QA, use the charmworldv3 flag and open up a bundle (search for hatch, for instance) and go to the deploy flag. The instructions there should be helpful and good.
To post a comment you must log in.
Reviewers: mp+193965_ code.launchpad. net,
Message:
Please take a look.
Description:
Use the new deployer url in our help text
To QA, use the charmworldv3 flag and open up a bundle (search for hatch,
for instance) and go to the deploy flag. The instructions there should
be helpful and good.
https:/ /code.launchpad .net/~gary/ juju-gui/ deployTabText/ +merge/ 193965
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/21980043/
Affected files (+15, -11 lines): bundle. js bundle. handlebars
A [revision details]
M app/models/
M app/templates/
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/models/ bundle. js bundle. js' bundle. js 2013-10-31 19:12:42 +0000 bundle. js 2013-11-05 16:53:21 +0000
=== modified file 'app/models/
--- app/models/
+++ app/models/
@@ -136,6 +136,7 @@
}
},
data: {},
+ deployer_file_url: {},
relations: {
/**
Return the relations data as a list of objects.
Index: app/templates/ bundle. handlebars bundle. handlebars' bundle. handlebars 2013-11-01 23:04:50 +0000 bundle. handlebars 2013-11-05 16:53:21 +0000
<h3>Deploy via quickstart (Under development)</h3>
<p>The quickstart plugin for Juju is an opinionated
<p>Step 1 - Install quickstart gui/quickstart- beta </pre> gui/quickstart- beta</pre> </pre>
</p> file_url} }</pre> json</pre> </p>
<h3>Deploy via the deployer</h3>
<p>Step 1 - Setup the virtual environment site-packages deployer bin/easy_ install juju-deployer bin/juju- deployer -h site-packages deployer/ bin/easy_ install deployer/ bin/juju- deployer -h</pre>
</p>
...
=== modified file 'app/templates/
--- app/templates/
+++ app/templates/
@@ -68,22 +68,23 @@
tool that helps you start Juju quickly and easily. These commands will
help you deploy the bundle to a cloud.</p>
- <pre>sudo add-apt-repository
ppa:juju-
-sudo apt-get update
-sudo apt-get install juju-quickstart
+ <pre>sudo add-apt-repository
ppa:juju-
+ <pre>sudo apt-get update</pre>
+ <pre>sudo apt-get install juju-quickstart
- <p>Step 2 - Deploy bundle
- <pre>juju quickstart <path to deployer
file></pre></p>
+ <p>Step 2 - Download and deploy bundle
+ <pre>wget -O bundle.json \</pre>
+ <pre> {{deployer_
+ <pre>juju quickstart bundle.
- <pre>% virtualenv --system-
-% ./deployer/
-% ./deployer/
- </pre>
+ <pre>virtualenv --system-
deployer</pre>
+ <pre>./
juju-deployer</pre>
+ <pre>./