Merge lp://staging/~doanac/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker-conf into lp://staging/~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker
Proposed by
Andy Doan
Status: | Merged |
---|---|
Merged at revision: | 11 |
Proposed branch: | lp://staging/~doanac/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker-conf |
Merge into: | lp://staging/~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker |
Diff against target: |
40 lines (+13/-0) 2 files modified
config.yaml (+7/-0) hooks/hooks.py (+6/-0) |
To merge this branch: | bzr merge lp://staging/~doanac/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker-conf |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Larson | Approve | ||
Francis Ginther | Pending | ||
Canonical CI Engineering | Pending | ||
Review via email: mp+203266@code.staging.launchpad.net |
Description of the change
This adds the ability to specify a config file that the charm will store under the root of the unit's source directory
To post a comment you must log in.
I played with this by deploying the branch- source- builder from our trunk with a small change like:
=== modified file 'juju-deployer/ branch- source- builder. yaml' branch- source- builder. yaml 2013-12-19 17:11:55 +0000 branch- source- builder. yaml 2014-01-26 21:46:10 +0000
options:
branch: lp:ubuntu-ci-services-itself
main: ./branch- source- builder/ run_worker base64: //configs/ unit_config. yaml
bsb-rabbit:
branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server
--- juju-deployer/
+++ juju-deployer/
@@ -20,6 +20,7 @@
+ unit-config: include-
charm: rabbitmq
I think this is what you guys were wanting, right?
This is config format agnostic which is probably useful. I did YAML locally, but the charm doesn't care.