OpenStack Charm Testing

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

lxd-qa
Merge into trunk

Proposed by Chuck Short on 2016-03-10

Status:	Rejected
Rejected by:	Ryan Beisner on 2016-04-18
Proposed branch:	lp://staging/~zulcss/openstack-charm-testing/lxd-qa
Merge into:	lp://staging/openstack-charm-testing
Diff against target:	735 lines (+306/-272) (has conflicts) 26 files modified bundles/lxd/default.yaml (+11/-0) 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-liberty.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 (+134/-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/neutron-master.yaml (+0/-19) bundles/lxd/source/next.yaml (+134/-0) bundles/lxd/source/nova-liberty.yaml (+16/-0) bundles/lxd/source/nova-master.yaml (+0/-19) Contents conflict in bundles/lxd/lxd.yaml Contents conflict in bundles/lxd/source/lxd.yaml
To merge this branch:	bzr merge lp://staging/~zulcss/openstack-charm-testing/lxd-qa
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ryan Beisner		2016-03-10	Disapprove on 2016-04-18
Review via email: mp+288645@code.staging.launchpad.net

Description of the change

- Add LXD dfs QA rig
- Update charms
- Clean up LXD directory.

Revision history for this message

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

I'd like to stick with the original o-c-t method of keeping YMMV/in-flight stuff in bundles/dev.

Here's what I'd like to see:

bundles/dev/lxd/*
In-flight, development bundle things. Things may move, come and go and disappear here. The dev dir can be the wild west. Nothing in the dev dir is automated. Some things there may be temporary WIP duplicates of bundles/lxd bits, and that is ok.

bundles/lxd/*
Should contain only maintained reference bundles. Other people will ask, we will point them here. We will also test from here. No need for a QA dir, as that is implied for anything in this dir.

bundles/lxd/source/next.yaml
bundles/lxd/source/stable.yaml
Deploy from source bundles. These are/may/will be automated. These should be THE reference lxd bundles for deploy-from-source, next and stable.

bundles/lxd/next.yaml
bundles/lxd/stable.yaml
This is automated. Keep these here as THE reference lxd bundles for the stable and next charms sets.

All bundles in o-c-t should indicate stable or next in the bundle file name. Most of your work will likely be next, and that's ok. If I need to create a stable bundle based on that, I can do that later without a file name conflict. So, for example, there wouldn't be a lxd.yaml bundle file anywhere in the mix.

Your bot who relies on programmatically predictable and stable file and folder names thanks you a ton. :-)

review: Needs Fixing

Revision history for this message

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

I would suggest a 3rd set of bundles:

bundles/lxd/isolate/next.yaml
bundles/lxd/isolate/stable.yaml

Which are identical to bundles/lxd/next.yaml and bundles/lxd/stable.yaml, except that the lxd service deploys from source or trunk or wherever tip is.

ie. Deploy everything from distro/cloud archive, except for lxd.

IMHO, That is where you will best detect whether lxd changes have broken something badly.

lp://staging/~zulcss/openstack-charm-testing/lxd-qa updated on 2016-03-10

184. By Chuck Short on 2016-03-10

Add isolated bundles

Add bundles without LXD so we can compare with a non-LXD deployment
if there are problems with LXD.

185. By Chuck Short on 2016-03-10

Focus only on nova-lxd when deploying from source

- Remove cinder, glance, horizon, and neturon DFS
  git branches since we only depeloy from nova-lxd
  from source.
- default.yaml deploys the stable charms from the
  charm store.
- next.yaml deploys the development charms with
  nova-lxd. This is also used for UOSCI in
  automated testing.

186. By Chuck Short on 2016-03-10

Remove qa bundles

187. By Chuck Short on 2016-03-10

Add xenial support

188. By Chuck Short on 2016-03-10

Spelling is hard

Revision history for this message

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

Looking good! Thanks for the rearrangement.

It's ok to remove the isolated dir since the source dir is doing lxd from source with all other services from distro/cloud archive.

Please see inline comments on 'bundles/lxd/source/next.yaml' and apply those changes to both source bundles. The goal there is to remove irrelevant and unneeded legacy config data from the bundle.

We should do the same on lxd/next.yaml and lxd/default.yaml, but that doesn't necessarily have to accompany this MP.

review: Needs Fixing

lp://staging/~zulcss/openstack-charm-testing/lxd-qa updated on 2016-03-11