Merge lp:~niedbalski/charms/trusty/nova-cloud-controller/fix-1350085 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Proposed by
Jorge Niedbalski
Status: | Rejected |
---|---|
Rejected by: | James Page |
Proposed branch: | lp:~niedbalski/charms/trusty/nova-cloud-controller/fix-1350085 |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next |
Diff against target: |
70 lines (+18/-2) (has conflicts) 2 files modified
config.yaml (+5/-0) hooks/nova_cc_hooks.py (+13/-2) Text conflict in config.yaml Text conflict in hooks/nova_cc_hooks.py |
To merge this branch: | bzr merge lp:~niedbalski/charms/trusty/nova-cloud-controller/fix-1350085 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Disapprove | ||
Review via email: mp+228772@code.launchpad.net |
Description of the change
- Fix for LP:#1350085 if the node is clustered, then use the vip address for db relation.
To post a comment you must log in.
Unmerged revisions
- 79. By Jorge Niedbalski
-
- Fix for 1350085 , if node is clustered, then use vip, ifnot use ip-address
- 78. By James Page
-
[james-
page,r= gnuoy] Cherry pick fixes for NSX on icehouse
Please see my comments on bug 1350085. I don't think that using the VIP as the source for access is correct - its only ever owned by a single node, so other nodes would not be able to access in this case and the nova-cloud- controller is a scale out charm.
There are a few merge conflicts as well