Merge lp://staging/~billy-olsen/charms/trusty/nova-cloud-controller/public-endpoint-host into lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by Billy Olsen
Status: Merged
Merged at revision: 165
Proposed branch: lp://staging/~billy-olsen/charms/trusty/nova-cloud-controller/public-endpoint-host
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 1162 lines (+440/-125)
14 files modified
config.yaml (+11/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+49/-44)
hooks/charmhelpers/contrib/openstack/neutron.py (+10/-5)
hooks/charmhelpers/contrib/openstack/utils.py (+65/-18)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+2/-0)
hooks/charmhelpers/contrib/python/packages.py (+28/-5)
hooks/charmhelpers/core/hookenv.py (+147/-10)
hooks/charmhelpers/core/host.py (+1/-1)
hooks/charmhelpers/core/services/base.py (+32/-11)
hooks/charmhelpers/fetch/__init__.py (+1/-1)
hooks/charmhelpers/fetch/giturl.py (+7/-5)
unit_tests/test_nova_cc_contexts.py (+8/-4)
unit_tests/test_nova_cc_hooks.py (+54/-21)
To merge this branch: bzr merge lp://staging/~billy-olsen/charms/trusty/nova-cloud-controller/public-endpoint-host
Reviewer Review Type Date Requested Status
Corey Bryant Approve
Review via email: mp+261006@code.staging.launchpad.net

Description of the change

Provides a config option which allows the user to specify the public hostname used to advertise to keystone when creating endpoints.

Note: this branch includes the charm-helpers change found in merge proposal https://code.launchpad.net/~billy-olsen/charm-helpers/better-address-endpoint-overrides/+merge/261000 which will need to be re-synced when that proposal is merged.

This is to get feedback for the change itself.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5044 nova-cloud-controller-next for billy-olsen mp261006
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5044/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #4724 nova-cloud-controller-next for billy-olsen mp261006
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4724/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4450 nova-cloud-controller-next for billy-olsen mp261006
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4450/

165. By Billy Olsen

Merge with /next

166. By Billy Olsen

c-h sync

167. By Billy Olsen

Fix unit tests broken with c-h sync

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5068 nova-cloud-controller-next for billy-olsen mp261006
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5068/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #4747 nova-cloud-controller-next for billy-olsen mp261006
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4747/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4475 nova-cloud-controller-next for billy-olsen mp261006
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4475/

Revision history for this message
Corey Bryant (corey.bryant) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches