Merge lp://qastaging/~fginther/charms/precise/ubuntu-ci-services-itself/lander-charm-helpers into lp://qastaging/~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander
Proposed by
Francis Ginther
Status: | Merged |
---|---|
Approved by: | Francis Ginther |
Approved revision: | 32 |
Merged at revision: | 27 |
Proposed branch: | lp://qastaging/~fginther/charms/precise/ubuntu-ci-services-itself/lander-charm-helpers |
Merge into: | lp://qastaging/~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander |
Diff against target: |
1477 lines (+1236/-134) 11 files modified
charm-helpers.yaml (+11/-0) config.yaml (+8/-0) hooks/config-changed (+0/-91) hooks/config-changed.py (+0/-31) hooks/hooks.py (+154/-11) lib/charmhelpers/core/hookenv.py (+395/-0) lib/charmhelpers/core/host.py (+291/-0) lib/charmhelpers/fetch/__init__.py (+279/-0) lib/charmhelpers/fetch/archiveurl.py (+48/-0) lib/charmhelpers/fetch/bzrurl.py (+49/-0) templates/jobs/lander_archiver.xml (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~fginther/charms/precise/ubuntu-ci-services-itself/lander-charm-helpers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andy Doan (community) | Approve | ||
Review via email:
|
Commit message
Merge config-changed hook into hooks.py and use charm-helpers. Provide config options to pull plugins from download site instead of using static files.
Description of the change
Merge config-changed hook into hooks.py and use charm-helpers. Provide config options to pull plugins from download site instead of using static files.
To post a comment you must log in.
some of the chmod using subprocess is annoying, but it looks like they need to be recursive, so its probably easiest this way.
I guess the next thing is to remove the _relation_* logic of hooks.py and fix the callers?