Merge lp:~frankban/charms/precise/juju-gui/deployer-031 into lp:~juju-gui/charms/precise/juju-gui/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 157 | ||||
Proposed branch: | lp:~frankban/charms/precise/juju-gui/deployer-031 | ||||
Merge into: | lp:~juju-gui/charms/precise/juju-gui/trunk | ||||
Diff against target: |
15 lines (+1/-3) 1 file modified
server-requirements.pip (+1/-3) |
||||
To merge this branch: | bzr merge lp:~frankban/charms/precise/juju-gui/deployer-031 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+203999@code.launchpad.net |
Description of the change
Update deployer to 0.3.1
Update the juju-deployer package to the newer version.
As a consequence, improve the bundle deployment feedback.
Tests: `make unittest`.
QA:
1) deploy the charm by bootstrapping juju and
then running `make deploy`.
2) wait for the service to be ready/started.
3) Open the GUI.
4) Try to deploy this bundle file:
http://
5) You should see an error in the GUI:
The deployment errored: Invalid config charm
cs:~openstack-
no-such-option=42
6) Try to deploy this bundle file:
http://
7) You should see an error in the GUI:
The deployment errored: Invalid relation in config,
service no-such not found,
rel mediawiki:db <-> no-such:db
Done, thank you!
Reviewers: mp+203999_ code.launchpad. net,
Message:
Please take a look.
Description:
Update deployer to 0.3.1
Update the juju-deployer package to the newer version.
As a consequence, improve the bundle deployment feedback.
Tests: `make unittest`.
QA:
1) deploy the charm by bootstrapping juju and
then running `make deploy`.
2) wait for the service to be ready/started.
3) Open the GUI.
4) Try to deploy this bundle file: pastebin. ubuntu. com/6844154/
http://
5) You should see an error in the GUI: ubuntu- testing/ precise/ mysql-4
The deployment errored: Invalid config charm
cs:~openstack-
no-such-option=42
6) Try to deploy this bundle file: pastebin. ubuntu. com/6844187/
http://
7) You should see an error in the GUI:
The deployment errored: Invalid relation in config,
service no-such not found,
rel mediawiki:db <-> no-such:db
Done, thank you!
https:/ /code.launchpad .net/~frankban/ charms/ precise/ juju-gui/ deployer- 031/+merge/ 203999
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/55230044/
Affected files (+1, -1 lines): deployer- 0.3.1-prereleas e.tar.gz deployer- 0.3.1.tar. gz requirements. pip
A [revision details]
D deps/juju-
A deps/juju-
M server-
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: server- requirements. pip requirements. pip' requirements. pip 2014-01-28 11:01:55 +0000 requirements. pip 2014-01-30 14:48:55 +0000 client= =0.12.0 =0.3.1- prerelease =0.3.1
=== modified file 'server-
--- server-
+++ server-
@@ -27,6 +27,4 @@
tornado==3.1.1
websocket-
jujuclient==0.15
-# Pre-release version of juju-deployer built from:
-# lp:~bac/juju-deployer/0.3.1-prerelease
-juju-deployer=
+juju-deployer=
Index: deps/juju- deployer- 0.3.1-prereleas e.tar.gz deployer- 0.3.1-prereleas e.tar.gz' deployer- 0.3.1-prereleas e.tar.gz 2014-01-22 15:24:00 deployer- 0.3.1-prereleas e.tar.gz 1970-01-01 00:00:00
=== removed file 'deps/juju-
Binary files deps/juju-
+0000 and deps/juju-
+0000 differ
Index: deps/juju- deployer- 0.3.1.tar. gz deployer- 0.3.1.tar. gz' deployer- 0.3.1.tar. gz 1970-01-01 00:00:00 +0000 and deployer- 0.3.1.tar. gz 2014-01-30 14:48:55 +0000 differ
=== added file 'deps/juju-
Binary files deps/juju-
deps/juju-