Merge lp://staging/~thedac/charm-helpers/fix-nova-cc-amqp into lp://staging/charm-helpers
Proposed by
David Ames
| Status: | Merged |
|---|---|
| Merged at revision: | 695 |
| Proposed branch: | lp://staging/~thedac/charm-helpers/fix-nova-cc-amqp |
| Merge into: | lp://staging/charm-helpers |
| Diff against target: |
96 lines (+10/-9) 2 files modified
charmhelpers/contrib/openstack/context.py (+2/-1) tests/contrib/openstack/test_os_contexts.py (+8/-8) |
| To merge this branch: | bzr merge lp://staging/~thedac/charm-helpers/fix-nova-cc-amqp |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alex Kavanagh (community) | Approve | ||
| Corey Bryant (community) | Approve | ||
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
In Ocata nova uses the transport_url for communication to rabbitmq.
In the charm the default port 5672 was assumed. However, when
rabbitmq uses SSL it changes the port to 5671.
This change is the fix which makes the default port explicit and
changes the port when SSL is in use.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks! Looks good to me but I can't merge.