Merge lp://qastaging/~james-page/charms/trusty/heat/liberty-fixes into lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/next
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 68 |
| Proposed branch: | lp://qastaging/~james-page/charms/trusty/heat/liberty-fixes |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/next |
| Diff against target: |
426 lines (+169/-56) 11 files modified
README.md (+9/-2) actions.yaml (+3/-0) actions/domain-setup (+21/-0) hooks/heat_context.py (+5/-3) hooks/heat_relations.py (+15/-0) hooks/heat_utils.py (+10/-4) templates/admin-openrc-v3 (+10/-0) templates/kilo/heat.conf (+18/-42) templates/liberty/heat.conf (+69/-0) unit_tests/test_heat_context.py (+7/-3) unit_tests/test_heat_relations.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/heat/liberty-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Lots of fixes for kilo and liberty support:
1) new template for liberty heat
2) generation of openrc file with credentials and setup for keystone v3
3) new action to configure required domains and accounts for heat stacks.
This change requires leader election - the charm will error out on older juju versions.
To post a comment you must log in.
Revision history for this message
| James Page (james-page) wrote | # |
Revision history for this message
| James Page (james-page) wrote | # |
Revision history for this message
| Ryan Beisner (1chb1n) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Re-testing on kilo as well