OpenStack Charm Testing

Merge lp://staging/~zulcss/openstack-charm-testing/lxd-updates into lp://staging/openstack-charm-testing

lxd-updates
Merge into trunk

Proposed by Chuck Short on 2016-03-22

Status:	Merged
Merged at revision:	189
Proposed branch:	lp://staging/~zulcss/openstack-charm-testing/lxd-updates
Merge into:	lp://staging/openstack-charm-testing
Diff against target:	1353 lines (+285/-843) 26 files modified bundles/lxd/default.yaml (+1/-1) bundles/lxd/glance-kilo.yaml (+0/-10) bundles/lxd/glance-liberty.yaml (+0/-10) bundles/lxd/glance-master.yaml (+0/-10) bundles/lxd/horizon-kilo.yaml (+0/-10) bundles/lxd/horizon-liberty.yaml (+0/-10) bundles/lxd/horizon-master.yaml (+0/-10) bundles/lxd/keystone-kilo.yaml (+0/-10) bundles/lxd/keystone-liberty.yaml (+0/-10) bundles/lxd/keystone-master.yaml (+0/-10) bundles/lxd/neutron-kilo.yaml (+0/-19) bundles/lxd/neutron-liberty.yaml (+0/-19) bundles/lxd/neutron-master.yaml (+0/-19) bundles/lxd/nova-kilo.yaml (+0/-13) bundles/lxd/nova-master.yaml (+0/-21) bundles/lxd/source/README (+11/-0) bundles/lxd/source/cinder-master.yaml (+0/-10) bundles/lxd/source/default.yaml (+185/-0) bundles/lxd/source/glance-master.yaml (+0/-10) bundles/lxd/source/horizon-master.yaml (+0/-10) bundles/lxd/source/keystone-master.yaml (+0/-10) bundles/lxd/source/lxd.yaml (+0/-367) bundles/lxd/source/neutron-master.yaml (+0/-19) bundles/lxd/source/next.yaml (+78/-225) bundles/lxd/source/nova-liberty.yaml (+8/-5) bundles/lxd/source/nova-master.yaml (+2/-5)
To merge this branch:	bzr merge lp://staging/~zulcss/openstack-charm-testing/lxd-updates
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ryan Beisner		2016-03-22	Approve on 2016-03-29
Review via email: mp+289803@code.staging.launchpad.net

Description of the change

This branch is a re-work of the LXD qa branch that was created before I went on vacation. It is a clean branch of all the changes that were made.

lp://staging/~zulcss/openstack-charm-testing/lxd-updates updated on 2016-03-23

194. By Chuck Short on 2016-03-22: Clean up DFS
195. By Chuck Short on 2016-03-23: Update git branch
196. By Chuck Short on 2016-03-23: Update git branch
197. By Chuck Short on 2016-03-23: Fix liberty deploy from source

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2016-03-29:

Thanks for your work on this. I'd like to see these be nearly identical wrt charms, topology, configuration:
    lxd/next.yaml
    lxd/source/next.yaml
    diff: http://paste.ubuntu.com/15551947/

Same for the stable.yaml files.

review: Needs Fixing

lp://staging/~zulcss/openstack-charm-testing/lxd-updates updated on 2016-03-29