Juju Charms Collection
keystone package

Merge lp://staging/~james-page/charms/trusty/keystone/network-splits into lp://staging/~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by James Page on 2014-07-24

Status:	Merged
Merged at revision:	72
Proposed branch:	lp://staging/~james-page/charms/trusty/keystone/network-splits
Merge into:	lp://staging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target:	1146 lines (+436/-198) 22 files modified .bzrignore (+2/-0) Makefile (+8/-3) charm-helpers-hooks.yaml (+1/-0) config.yaml (+29/-9) hooks/charmhelpers/contrib/hahelpers/cluster.py (+2/-2) hooks/charmhelpers/contrib/network/ip.py (+156/-0) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+3/-5) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+1/-45) hooks/charmhelpers/contrib/openstack/context.py (+50/-9) hooks/charmhelpers/contrib/openstack/ip.py (+75/-0) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+6/-1) hooks/charmhelpers/core/host.py (+4/-0) hooks/keystone_hooks.py (+24/-5) hooks/keystone_utils.py (+33/-29) tests/charmhelpers/contrib/amulet/deployment.py (+14/-19) tests/charmhelpers/contrib/amulet/utils.py (+2/-2) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+3/-5) tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-45) unit_tests/test_keystone_contexts.py (+3/-1) unit_tests/test_keystone_hooks.py (+12/-10) unit_tests/test_keystone_utils.py (+4/-5) unit_tests/test_utils.py (+3/-3)
To merge this branch:	bzr merge lp://staging/~james-page/charms/trusty/keystone/network-splits
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Liam Young (community)	2014-07-24	Approve on 2014-07-29
James Page		Needs Resubmitting on 2014-07-28
Review via email: mp+228142@code.staging.launchpad.net

Description of the change

Add support for multiple network configuration.

lp://staging/~james-page/charms/trusty/keystone/network-splits updated on 2014-07-25

89. By James Page on 2014-07-25: Rebase

Revision history for this message

Liam Young (gnuoy) on 2014-07-28:

review: Needs Fixing

lp://staging/~james-page/charms/trusty/keystone/network-splits updated on 2014-07-28

90. By James Page on 2014-07-28: Use charm-helpers to resolved addresses
91. By James Page on 2014-07-28: Resync helpers

Revision history for this message

James Page (james-page) on 2014-07-28:

review: Needs Resubmitting

Revision history for this message

Liam Young (gnuoy) wrote on 2014-07-29:

Unit test and lint failures:

test_add_service_to_keystone_clustered_https_none_values (unit_tests.test_keystone_utils.TestKeystoneUtils) ... ERROR
test_add_service_to_keystone_no_clustered_no_https_complete_values (unit_tests.test_keystone_utils.TestKeystoneUtils) ... ERROR
test_add_service_to_keystone_nosubset (unit_tests.test_keystone_utils.TestKeystoneUtils) ... ERROR

hooks/keystone_hooks.py:204:1: W293 blank line contains whitespace
hooks/keystone_utils.py:19:1: F401 'get_address_in_network' imported but unused
hooks/keystone_utils.py:40:1: F401 'unit_private_ip' imported but unused