Merge lp://qastaging/~gandelman-a/charms/precise/keystone/swift_redux into lp://qastaging/~charmers/charms/precise/keystone/trunk
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 39 |
| Proposed branch: | lp://qastaging/~gandelman-a/charms/precise/keystone/swift_redux |
| Merge into: | lp://qastaging/~charmers/charms/precise/keystone/trunk |
| Diff against target: |
62 lines (+15/-4) 3 files modified
hooks/keystone-hooks (+9/-1) hooks/utils.py (+5/-2) revision (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~gandelman-a/charms/precise/keystone/swift_redux |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
Description of the change
Fixes up Keystone for proper swift integration:
- Updates the list of valid services to point swift to the correct endpoint/service type.
- Allows remote services to request that new roles be created. This is required for
Swift and probably Ceilometer. New roles are automatically associated with the existing
Admin user + tenant.
- Fixed an issue where generated passwds were being echod to logs via juju-log.
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
Changes look good; readme is outdated and could do with an update but thats not a blocker.