Merge lp:~fginther/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker-lp into lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander
Status: | Rejected |
---|---|
Rejected by: | Francis Ginther |
Proposed branch: | lp:~fginther/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker-lp |
Merge into: | lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander |
Diff against target: |
300 lines (+266/-0) (has conflicts) 4 files modified
README.ex (+41/-0) config.yaml (+44/-0) hooks/hooks.py (+171/-0) metadata.yaml (+10/-0) Conflict adding file config.yaml. Moved existing file to config.yaml.moved. Conflict adding file hooks. Moved existing file to hooks.moved. Conflict adding file metadata.yaml. Moved existing file to metadata.yaml.moved. |
To merge this branch: | bzr merge lp:~fginther/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker-lp |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Canonical CI Engineering | Pending | ||
Review via email: mp+203930@code.launchpad.net |
Commit message
Add the ability to pass launchpad credentials to the worker node, uses a base64 encoded file called "launchpad.
Description of the change
Add the ability to pass launchpad credentials to the worker node, uses a base64 encoded file called "launchpad.
Unmerged revisions
- 14. By Francis Ginther
-
Add import base64.
- 13. By Francis Ginther
-
Add some lp_creds debugging.
- 12. By Francis Ginther
-
Adjust file path to remove hidden hint.
- 11. By Francis Ginther
-
Add launchpa credentials file.
- 10. By Paul Larson
-
add support for installing pip packages
- 9. By Andy Doan
-
allow user/group for service to be configurable
- 8. By Andy Doan
-
update how amqp parameters are set
allow the worker to dynamically load the config from a file. If
you don't do this, you have to issue a "stop <service>; start <service>"
in order for upstart to detect a change from a bad config to a good
config - 7. By Andy Doan
-
give a limit to the retries for the upstart job
- 6. By Andy Doan
-
fix quoting issue
- 5. By Andy Doan
-
fix eol issue on relation_get()
could we use "unit_config" for this also and include lpcredentials as a value in it? or alternatively just use the unit_config we have now which I think includes all the information needed to create this credentials file?
NOTE: I've proposed moving this charm:
https:/ /code.launchpad .net/~doanac/ ubuntu- ci-services- itself/ rabbitwork- local/+ merge/203830
you probably want to rebase this MP on to that