Merge lp://qastaging/~billy-olsen/charms/trusty/ceph-radosgw/public-endpoint-host into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Proposed by
Billy Olsen
Status: | Merged |
---|---|
Merged at revision: | 39 |
Proposed branch: | lp://qastaging/~billy-olsen/charms/trusty/ceph-radosgw/public-endpoint-host |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-radosgw/next |
Diff against target: |
1126 lines (+460/-135) 16 files modified
config.yaml (+12/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+15/-6) 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/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) hooks/hooks.py (+4/-15) tests/charmhelpers/contrib/amulet/utils.py (+8/-1) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+15/-6) unit_tests/test_hooks.py (+41/-7) |
To merge this branch: | bzr merge lp://qastaging/~billy-olsen/charms/trusty/ceph-radosgw/public-endpoint-host |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Corey Bryant (community) | Approve | ||
Review via email:
|
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.
To post a comment you must log in.
charm_lint_check #5049 ceph-radosgw-next for billy-olsen mp261011
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/5049/