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

[Chuck Short]

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

[Ryan Beisner (1chb1n)]

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

[Ryan Beisner (1chb1n)]

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:~zulcss/openstack-charm-testing/lxd-qa]

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

[Ryan Beisner (1chb1n)]

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:~zulcss/openstack-charm-testing/lxd-qa]

189. By Chuck Short on 2016-03-10

Remove isoloated

190. By Chuck Short on 2016-03-10

Cleanup bundle

191. By Chuck Short on 2016-03-11

Remove isolated

192. By Chuck Short on 2016-03-11

Clean up next branch

[Ryan Beisner (1chb1n)]

Too much stuff removed in that last clean-up.

review: Needs Fixing

[lp:~zulcss/openstack-charm-testing/lxd-qa]

193. By Chuck Short on 2016-03-21

Revert last commit

194. By Chuck Short on 2016-03-21

Update branches

195. By Chuck Short on 2016-03-21

Update

[Ryan Beisner (1chb1n)]

FYI, a separate re-do merge proposal has already been merged.

review: Disapprove

Unmerged revisions

195. By Chuck Short on 2016-03-21

Update

194. By Chuck Short on 2016-03-21

Update branches

193. By Chuck Short on 2016-03-21

Revert last commit

192. By Chuck Short on 2016-03-11

Clean up next branch

191. By Chuck Short on 2016-03-11

Remove isolated

190. By Chuck Short on 2016-03-10

Cleanup bundle

189. By Chuck Short on 2016-03-10

Remove isoloated

188. By Chuck Short on 2016-03-10

Spelling is hard

187. By Chuck Short on 2016-03-10

Add xenial support

186. By Chuck Short on 2016-03-10

Remove qa bundles

=== modified file 'bundles/lxd/default.yaml'
--- bundles/lxd/default.yaml	2016-03-11 09:33:21 +0000
+++ bundles/lxd/default.yaml	2016-03-21 15:03:28 +0000
@@ -160,3 +160,14 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+xenial-mitaka:
+  inherits: openstack-icehouse
+  series: xenial
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+xenial-mitaka-proposed:
+  inherits: xenial-mitaka
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
 
=== removed file 'bundles/lxd/glance-kilo.yaml'
--- bundles/lxd/glance-kilo.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/glance-kilo.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/kilo}
-  - {name: glance,
-     repository: 'git://github.com/openstack/glance',
-     branch: stable/kilo}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/glance-liberty.yaml'
--- bundles/lxd/glance-liberty.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/glance-liberty.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/liberty}
-  - {name: glance,
-     repository: 'git://github.com/openstack/glance',
-     branch: stable/liberty}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/glance-master.yaml'
--- bundles/lxd/glance-master.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/glance-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/zulcss/requirements',
-     branch: master}
-  - {name: glance,
-     repository: 'git://github.com/openstack/glance',
-     branch: 12.0.0.0b2}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/horizon-kilo.yaml'
--- bundles/lxd/horizon-kilo.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/horizon-kilo.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/kilo}
-  - {name: horizon,
-     repository: 'git://github.com/openstack/horizon',
-     branch: stable/kilo}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/horizon-liberty.yaml'
--- bundles/lxd/horizon-liberty.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/horizon-liberty.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/liberty}
-  - {name: horizon,
-     repository: 'git://github.com/openstack/horizon',
-     branch: stable/liberty}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/horizon-master.yaml'
--- bundles/lxd/horizon-master.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/horizon-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/zulcss/requirements',
-     branch: master}
-  - {name: horizon,
-     repository: 'git://github.com/openstack/horizon',
-     branch:  9.0.0.0b2}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/keystone-kilo.yaml'
--- bundles/lxd/keystone-kilo.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/keystone-kilo.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/kilo}
-  - {name: keystone,
-     repository: 'git://github.com/openstack/keystone',
-     branch: stable/kilo}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/keystone-liberty.yaml'
--- bundles/lxd/keystone-liberty.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/keystone-liberty.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/liberty}
-  - {name: keystone,
-     repository: 'git://github.com/openstack/keystone',
-     branch: stable/liberty}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/keystone-master.yaml'
--- bundles/lxd/keystone-master.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/keystone-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/zulcss/requirements',
-     branch: master}
-  - {name: keystone,
-     repository: 'git://github.com/openstack/keystone',
-     branch: 9.0.0.0b2}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== renamed file 'bundles/lxd/lxd.yaml' => 'bundles/lxd/lxd.yaml.THIS'
=== removed file 'bundles/lxd/neutron-kilo.yaml'
--- bundles/lxd/neutron-kilo.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/neutron-kilo.yaml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/kilo}
-  - {name: neutron-fwaas,
-     repository: 'git://github.com/openstack/neutron-fwaas',
-     branch: stable/kilo}
-  - {name: neutron-lbaas,
-     repository: 'git://github.com/openstack/neutron-lbaas',
-     branch: stable/kilo}
-  - {name: neutron-vpnaas,
-     repository: 'git://github.com/openstack/neutron-vpnaas',
-     branch: stable/kilo}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: stable/kilo}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/neutron-liberty.yaml'
--- bundles/lxd/neutron-liberty.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/neutron-liberty.yaml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/liberty}
-  - {name: neutron-fwaas,
-     repository: 'git://github.com/openstack/neutron-fwaas',
-     branch: stable/liberty}
-  - {name: neutron-lbaas,
-     repository: 'git://github.com/openstack/neutron-lbaas',
-     branch: stable/liberty}
-  - {name: neutron-vpnaas,
-     repository: 'git://github.com/openstack/neutron-vpnaas',
-     branch: stable/liberty}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: stable/liberty}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/neutron-master.yaml'
--- bundles/lxd/neutron-master.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/neutron-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/zulcss/requirements',
-     branch: master}
-  - {name: neutron-fwaas,
-     repository: 'git://github.com/openstack/neutron-fwaas',
-     branch: 8.0.0.0b2}
-  - {name: neutron-lbaas,
-     repository: 'git://github.com/openstack/neutron-lbaas',
-     branch: 8.0.0.0b2}
-  - {name: neutron-vpnaas,
-     repository: 'git://github.com/openstack/neutron-vpnaas',
-     branch: 8.0.0.0b2}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: 8.0.0.0b2}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/nova-kilo.yaml'
--- bundles/lxd/nova-kilo.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/nova-kilo.yaml	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/kilo}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: stable/kilo}
-  - {name: nova,
-     repository: 'git://github.com/openstack/nova',
-     branch: stable/kilo}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/nova-liberty.yaml'
--- bundles/lxd/nova-liberty.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/nova-liberty.yaml	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/liberty}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: stable/liberty}
-  - {name: nova,
-     repository: 'git://github.com/openstack/nova',
-     branch: stable/liberty}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/nova-master.yaml'
--- bundles/lxd/nova-master.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/nova-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# Update this file to point to master when Xenial
-# is available
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/zulcss/requirements',
-     branch: master}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: 8.0.0.0b2}
-  - {name: nova-lxd,
-     repository: 'git://github.com/lxc/nova-lxd',
-     branch: master}
-  - {name: pylxd,
-     repository: 'git://github.com/lxc/pylxd',
-     branch: master}
-  - {name: nova,
-     repository: 'git://github.com/openstack/nova',
-     branch: 13.0.0.0b2}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== added file 'bundles/lxd/source/README'
--- bundles/lxd/source/README	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/README	2016-03-21 15:03:28 +0000
@@ -0,0 +1,11 @@
+bundles/lxd/qa
+==============
+
+The following bundle are meant to be consumed by UOSCI
+in automated git deployment testing. They are working
+bundles, updated throughout the dev cycle.
+
+== Branches ==
+
+To test your branch, replace the master branch with 
+the branch that you want to test in the nova-master.yaml.
 
=== removed file 'bundles/lxd/source/cinder-master.yaml'
--- bundles/lxd/source/cinder-master.yaml	2015-07-23 20:48:46 +0000
+++ bundles/lxd/source/cinder-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: master}
-  - {name: cinder,
-     repository: 'git://github.com/openstack/cinder',
-     branch: master}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== added file 'bundles/lxd/source/default.yaml'
--- bundles/lxd/source/default.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/default.yaml	2016-03-21 15:03:28 +0000
@@ -0,0 +1,134 @@
+# vim: set ts=2 et:
+# deployer bundle for development ('next') charms
+# UOSCI relies on this for OS-on-OS deployment testing
+openstack-services:
+  services:
+    mysql:
+      branch: https://github.com/openstack/charm-percona-cluster;stable
+      constraints: mem=4G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+    rabbitmq-server:
+      branch: https://github.com/openstack/charm-rabbitmq-server;stable
+      constraints: mem=1G
+    keystone:
+      branch: https://github.com/openstack/charm-keystone;stable
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      branch: https://github.com/openstack/charm-openstack-dashboard;stable
+      constraints: mem=1G
+    nova-compute:
+      branch: https://github.com/openstack/charm-nova-compute;stable
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+        migration-auth-type: ssh
+        virt-type: lxd
+    nova-cloud-controller:
+      branch: https://github.com/openstack/charm-nova-cloud-controller;stable
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+    neutron-gateway:
+      branch: https://github.com/openstack/charm-neutron-gateway;stable
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    glance:
+      branch: https://github.com/openstack/charm-glance;stable
+      constraints: mem=1G
+    lxd:
+      branch: https://github.com/openstack/charm-lxd
+      options:
+        block-device: /mnt/disk.img|20G
+        storage-type: btrfs
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
+    - [ nova-compute, lxd ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+    - [ openstack-dashboard, keystone ]
+    - [ neutron-api, mysql ]
+    - [ neutron-api, rabbitmq-server ]
+    - [ neutron-api, nova-cloud-controller ]
+    - [ neutron-api, neutron-openvswitch ]
+    - [ neutron-api, keystone ]
+    - [ neutron-api, neutron-gateway ]
+    - [ neutron-openvswitch, nova-compute ]
+    - [ neutron-openvswitch, rabbitmq-server ]
+# liberty
+openstack-liberty-git:
+  inherits: openstack-services
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-liberty.yaml
+trusty-liberty:
+  inherits: openstack-liberty-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: openstack-liberty-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+wily-liberty:
+  inherits: openstack-liberty-git
+  series: wily
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+# master
+openstack-master-git:
+  inherits: openstack-services
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+trusty-master:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka
+    source: cloud:trusty-mitaka
+trusty-master-proposed:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka/proposed
+# xenial
+xenial-master:
+  inherits: openstack-master-git
+  series: xenial
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+xenial-master-proposed:
+   inherits: openstack-master-git
+   series: xenial
+   overrides:
+      source: proposed
+      openstack-origin: distro-proposed
 
=== removed file 'bundles/lxd/source/glance-master.yaml'
--- bundles/lxd/source/glance-master.yaml	2015-07-23 20:48:46 +0000
+++ bundles/lxd/source/glance-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: master}
-  - {name: glance,
-     repository: 'git://github.com/openstack/glance',
-     branch: master}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/source/horizon-master.yaml'
--- bundles/lxd/source/horizon-master.yaml	2015-07-23 20:48:46 +0000
+++ bundles/lxd/source/horizon-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: master}
-  - {name: horizon,
-     repository: 'git://github.com/openstack/horizon',
-     branch: master}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/source/keystone-master.yaml'
--- bundles/lxd/source/keystone-master.yaml	2015-07-23 20:48:46 +0000
+++ bundles/lxd/source/keystone-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: master}
-  - {name: keystone,
-     repository: 'git://github.com/openstack/keystone',
-     branch: master}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== renamed file 'bundles/lxd/source/lxd.yaml' => 'bundles/lxd/source/lxd.yaml.THIS'
=== removed file 'bundles/lxd/source/neutron-master.yaml'
--- bundles/lxd/source/neutron-master.yaml	2015-07-23 20:48:46 +0000
+++ bundles/lxd/source/neutron-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: master}
-  - {name: neutron-fwaas,
-     repository: 'git://github.com/openstack/neutron-fwaas',
-     branch: master}
-  - {name: neutron-lbaas,
-     repository: 'git://github.com/openstack/neutron-lbaas',
-     branch: master}
-  - {name: neutron-vpnaas,
-     repository: 'git://github.com/openstack/neutron-vpnaas',
-     branch: master}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: master}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128
 
=== added file 'bundles/lxd/source/next.yaml'
--- bundles/lxd/source/next.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/next.yaml	2016-03-21 15:03:28 +0000
@@ -0,0 +1,134 @@
+# vim: set ts=2 et:
+# deployer bundle for development ('next') charms
+# UOSCI relies on this for OS-on-OS deployment testing
+openstack-services:
+  services:
+    mysql:
+      branch: https://github.com/openstack/charm-percona-cluster
+      constraints: mem=4G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+    rabbitmq-server:
+      branch: https://github.com/openstack/charm-rabbitmq-server
+      constraints: mem=1G
+    keystone:
+      branch: https://github.com/openstack/charm-keystone
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      branch: https://github.com/openstack/charm-openstack-dashboard
+      constraints: mem=1G
+    nova-compute:
+      branch: https://github.com/openstack/charm-nova-compute
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+        migration-auth-type: ssh
+        virt-type: lxd
+    nova-cloud-controller:
+      branch: https://github.com/openstack/charm-nova-cloud-controller
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+    neutron-gateway:
+      branch: https://github.com/openstack/charm-neutron-gateway
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    glance:
+      branch: https://github.com/openstack/charm-glance
+      constraints: mem=1G
+    lxd:
+      branch: https://github.com/openstack/charm-lxd
+      options:
+        block-device: /mnt/disk.img|20G
+        storage-type: btrfs
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
+    - [ nova-compute, lxd ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+    - [ openstack-dashboard, keystone ]
+    - [ neutron-api, mysql ]
+    - [ neutron-api, rabbitmq-server ]
+    - [ neutron-api, nova-cloud-controller ]
+    - [ neutron-api, neutron-openvswitch ]
+    - [ neutron-api, keystone ]
+    - [ neutron-api, neutron-gateway ]
+    - [ neutron-openvswitch, nova-compute ]
+    - [ neutron-openvswitch, rabbitmq-server ]
+# liberty
+openstack-liberty-git:
+  inherits: openstack-services
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-liberty.yaml
+trusty-liberty:
+  inherits: openstack-liberty-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: openstack-liberty-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+wily-liberty:
+  inherits: openstack-liberty-git
+  series: wily
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+# master
+openstack-master-git:
+  inherits: openstack-services
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+trusty-master:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka
+    source: cloud:trusty-mitaka
+trusty-master-proposed:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka/proposed
+# xenial
+xenial-master:
+  inherits: openstack-master-git
+  series: xenial
+  services:
+    mysql:
+      branch: lp:~james-page/charms/trusty/mysql/forward-compat-xenial
+xenial-master-proposed:
+   inherits: openstack-master-git
+   series: xenial
+   overrides:
+      source: proposed
+      openstack-origin: distro-proposed
 
=== added file 'bundles/lxd/source/nova-liberty.yaml'
--- bundles/lxd/source/nova-liberty.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/nova-liberty.yaml	2016-03-21 15:03:28 +0000
@@ -0,0 +1,16 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: stable/liberty}
+  - {name: nova-lxd,
+     repository: 'git://github.com/zulcss/nova-lxd',
+     branch: stable/liberty}
+  - {name: pylxd,
+     repository: 'git://github.com/zulcss/pylxd',
+     branch: stable/liberty}
+  - {name: nova,
+     repository: 'git://github.com/openstack/nova',
+     branch: stable/liberty}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128
 
=== added file 'bundles/lxd/source/nova-master.yaml'
--- bundles/lxd/source/nova-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/nova-master.yaml	2016-03-21 15:03:28 +0000
@@ -0,0 +1,18 @@
+# Update this file to point to master when Xenial
+# is available
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: master}
+  - {name: nova-lxd,
+     repository: 'git://github.com/lxc/nova-lxd',
+     branch: master}
+  - {name: pylxd,
+     repository: 'git://github.com/lxc/pylxd',
+     branch: master}
+  - {name: nova,
+     repository: 'git://github.com/openstack/nova',
+     branch: 13.0.0.0b3}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128
 
=== removed file 'bundles/lxd/source/nova-master.yaml'
--- bundles/lxd/source/nova-master.yaml	2015-07-23 20:48:46 +0000
+++ bundles/lxd/source/nova-master.yaml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-repositories:
-  - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: master}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: master}
-  - {name: pylxd,
-     repository: 'https://github.com/lxc/pylxd',
-     branch: master}
-  - {name: nova-compute-lxd,
-     repository: 'https://github.com/lxc/nova-compute-lxd',
-     branch: master}
-  - {name: nova,
-     repository: 'git://github.com/openstack/nova',
-     branch: master}
-directory: /mnt/openstack-git
-http_proxy: http://squid.internal:3128
-https_proxy: http://squid.internal:3128