Merge lp:~frankban/charms/precise/juju-gui/install-yaml into lp:~juju-gui/charms/precise/juju-gui/trunk
Status: | Merged |
---|---|
Merged at revision: | 127 |
Proposed branch: | lp:~frankban/charms/precise/juju-gui/install-yaml |
Merge into: | lp:~juju-gui/charms/precise/juju-gui/trunk |
Diff against target: |
145 lines (+28/-25) 6 files modified
hooks/backend.py (+1/-2) hooks/install (+10/-6) hooks/utils.py (+12/-12) revision (+1/-1) server-requirements.pip (+2/-0) tests/test_backends.py (+2/-4) |
To merge this branch: | bzr merge lp:~frankban/charms/precise/juju-gui/install-yaml |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+195113@code.launchpad.net |
Description of the change
Fix base Python dependencies.
The install hook imported charmhelpers
before installing python-yaml, and
charmhelpers imports from yaml.
This very old bug has been hidden by the
fact that python-yaml is automatically
installed in ec2/lxc instances, but showed
itself when using the manual provider.
Copy/pasting and integrating the QA from
my last branch, a double check can help
before the release.
QA:
- Bootstrap a Juju environment with --debug.
- Deploy and expose the GUI (make deploy).
- Check juju debug-log (or
less ~/.juju/
used lxc): you should see the following message
at the beginning of the install hook log:
"Installing base Python dependencies: python-apt,
python-
- Wait for the GUI to be ready/started.
- Deploy this bundle: http://
- Check everything is ok, xy annotations work (
the services are vertically aligned), wordpress has
customized constraints, mysql customized options and
two units.
- No try to deploy the same bundle again, you
will see a "services already there" kind of error.
Reviewers: mp+195113_ code.launchpad. net,
Message:
Please take a look.
Description:
Fix base Python dependencies.
The install hook imported charmhelpers
before installing python-yaml, and
charmhelpers imports from yaml.
This very old bug has been hidden by the
fact that python-yaml is automatically
installed in ec2/lxc instances, but showed
itself when using the manual provider.
Copy/pasting and integrating the QA from local/log/ unit-juju- gui-0.log if you launchpadlib, python-tempita, python-yaml." pastebin. ubuntu. com/6411548/
my last branch, a double check can help
before the release.
QA:
- Bootstrap a Juju environment with --debug.
- Deploy and expose the GUI (make deploy).
- Check juju debug-log (or
less ~/.juju/
used lxc): you should see the following message
at the beginning of the install hook log:
"Installing base Python dependencies: python-apt,
python-
- Wait for the GUI to be ready/started.
- Deploy this bundle: http://
- Check everything is ok, xy annotations work (
the services are vertically aligned), wordpress has
customized constraints, mysql customized options and
two units.
- No try to deploy the same bundle again, you
will see a "services already there" kind of error.
https:/ /code.launchpad .net/~frankban/ charms/ precise/ juju-gui/ install- yaml/+merge/ 195113
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/26190043/
Affected files (+30, -25 lines): requirements. pip backends. py
A [revision details]
M hooks/backend.py
M hooks/install
M hooks/utils.py
M revision
M server-
M tests/test_
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: revision
=== modified file 'revision'
--- revision 2013-11-13 16:36:02 +0000
+++ revision 2013-11-13 18:01:03 +0000
@@ -1,1 +1,1 @@
-97
+98
Index: server- requirements. pip requirements. pip' requirements. pip 2013-11-13 17:45:50 +0000 requirements. pip 2013-11-13 18:01:03 +0000
=== modified file 'server-
--- server-
+++ server-
@@ -18,6 +18,8 @@
# Note: the order of the following dependencies is important! The last ones
# depends on the previous.
+# The python-bzrlib and python-yaml dependencies are installed using apt in
+# the charm hooks.
futures==2.1.4
tornado==3.1.1
Index: hooks/backend.py
=== modified file 'hooks/backend.py'
--- hooks/backend.py 2013-10-08 07:46:11 +0000
+++ hooks/backend.py 2013-11-13 18:01:03 +0000
@@ -106,8 +106,7 @@
class GoMixin(object):
"""Manage the real Go juju-core backend."""
-
- debs = ('python-yaml',)
+ pass
class GuiMixin(object):
Index: hooks/install
=== modified file 'hooks/install'
--- hooks/install 2013-10-07 14:45:00 +0000
+++ hooks/install 2013-11-13 18:01:03 +0000
@@ -20,10 +20,6 @@
import errno
import os
-from charmhelpers import ( get_install,
- get_config,
- log,
-)
from shelltoolbox import (
apt_
run,
@@ -32,1...