Juju Charms Collection
nova-compute package

Merge lp://qastaging/~james-page/charms/trusty/nova-compute/network-splits into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by James Page on 2014-07-24

Status:	Merged
Merged at revision:	73
Proposed branch:	lp://qastaging/~james-page/charms/trusty/nova-compute/network-splits
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target:	82 lines (+27/-8) 4 files modified .bzrignore (+2/-0) Makefile (+11/-6) config.yaml (+10/-0) hooks/nova_compute_context.py (+4/-2)
To merge this branch:	bzr merge lp://qastaging/~james-page/charms/trusty/nova-compute/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+228148@code.qastaging.launchpad.net

Description of the change

Add support for multiple network configuration.

lp://qastaging/~james-page/charms/trusty/nova-compute/network-splits updated on 2014-07-25

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

Revision history for this message

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

Getting text conflicts

Contents conflict in charm-helpers.yaml
Conflict adding file hooks/charmhelpers/contrib/network/ip.py. Moved existing file to hooks/charmhelpers/contrib/network/ip.py.moved.
Conflict adding file hooks/charmhelpers/contrib/openstack/amulet. Moved existing file to hooks/charmhelpers/contrib/openstack/amulet.moved.
Text conflict in hooks/charmhelpers/contrib/openstack/context.py
Conflict adding file hooks/charmhelpers/contrib/openstack/ip.py. Moved existing file to hooks/charmhelpers/contrib/openstack/ip.py.moved.
Conflict adding file hooks/charmhelpers/core/fstab.py. Moved existing file to hooks/charmhelpers/core/fstab.py.moved.
7 conflicts encountered.