Merge lp://qastaging/~openstack-charmers/charms/precise/nova-compute/icehouse into lp://qastaging/~openstack-charmers-archive/charms/precise/nova-compute/trunk
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 59 |
| Proposed branch: | lp://qastaging/~openstack-charmers/charms/precise/nova-compute/icehouse |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/nova-compute/trunk |
| Diff against target: |
1133 lines (+351/-204) 24 files modified
Makefile (+1/-2) hooks/charmhelpers/contrib/hahelpers/apache.py (+9/-8) hooks/charmhelpers/contrib/openstack/context.py (+106/-25) hooks/charmhelpers/contrib/openstack/neutron.py (+14/-4) hooks/charmhelpers/contrib/openstack/utils.py (+1/-0) hooks/nova_compute_context.py (+10/-2) hooks/nova_compute_hooks.py (+35/-19) hooks/nova_compute_utils.py (+39/-19) metadata.yaml (+2/-0) revision (+1/-1) templates/essex/nova.conf (+1/-1) templates/folsom/nova.conf (+4/-10) templates/folsom/ovs_quantum_plugin.ini (+0/-8) templates/folsom/quantum.conf (+2/-8) templates/grizzly/nova.conf (+4/-10) templates/havana/neutron.conf (+1/-7) templates/havana/nova.conf (+4/-10) templates/havana/ovs_neutron_plugin.ini (+0/-8) templates/icehouse/ml2_conf.ini (+30/-0) templates/parts/database (+3/-0) templates/parts/rabbitmq (+21/-0) unit_tests/test_nova_compute_contexts.py (+4/-1) unit_tests/test_nova_compute_hooks.py (+52/-57) unit_tests/test_nova_compute_utils.py (+7/-4) |
| To merge this branch: | bzr merge lp://qastaging/~openstack-charmers/charms/precise/nova-compute/icehouse |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Icehouse Support
Active/Active RMQ
Postgresql
SSL keystone
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
