Merge lp://qastaging/~doanac/uci-engine/rabbit-worker-charmhelpers into lp://qastaging/uci-engine
Proposed by
Andy Doan
| Status: | Merged |
|---|---|
| Approved by: | Andy Doan |
| Approved revision: | 635 |
| Merged at revision: | 635 |
| Proposed branch: | lp://qastaging/~doanac/uci-engine/rabbit-worker-charmhelpers |
| Merge into: | lp://qastaging/uci-engine |
| Diff against target: |
503 lines (+195/-120) 10 files modified
charms/precise/rabbitmq-worker/Makefile (+3/-0) charms/precise/rabbitmq-worker/config.yaml (+0/-10) charms/precise/rabbitmq-worker/hooks/hooks.py (+53/-102) charms/precise/rabbitmq-worker/unit_tests/__init__.py (+14/-0) charms/precise/rabbitmq-worker/unit_tests/test_hooks.py (+124/-0) juju-deployer/branch-source-builder.yaml.tmpl (+0/-2) juju-deployer/image-builder.yaml.tmpl (+0/-2) juju-deployer/publisher.yaml.tmpl (+0/-2) juju-deployer/test-runner.yaml.tmpl (+0/-2) testing/run_tests.py (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~doanac/uci-engine/rabbit-worker-charmhelpers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Celso Providelo (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
rabbit worker charm: convert to charmhelpers
This gets the rabbit worker charm using charmhelpers everywhere its
applicable.
One great benefit: I discovered the root of a bug we'd been seeing
forever where our worker started but failed to connect to rabbit. The
issue was that the first "config-changed" call wasn't including the
rabbit password. ie - the relation wasn't completely ready. This new
code detects that situation and prevents us from starting up until
the password is ready.
Description of the change
This does 2 things:
1) remove the bzr/vcs option for the charm. We will never use/support this mechanism
2) get us using charm helpers for the rabbit charm
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Andy Doan (doanac) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:634
http://
Executed test runs:
Click here to trigger a rebuild:
http://