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

[Chuck Short]

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

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

[Ryan Beisner (1chb1n)]

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

198. By Chuck Short on 2016-03-29

update charms

[Ryan Beisner (1chb1n)]

One typo, see inline.

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

199. By Chuck Short on 2016-03-29

Add more targets

200. By Chuck Short on 2016-03-29

Fix typo

201. By Chuck Short on 2016-03-29

More syncs

202. By Chuck Short on 2016-03-29

More sync

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'bundles/lxd/default.yaml'
--- bundles/lxd/default.yaml	2016-03-22 17:02:55 +0000
+++ bundles/lxd/default.yaml	2016-03-29 17:26:34 +0000
@@ -85,7 +85,7 @@
       branch: lp:charms/trusty/mongodb
       constraints: mem=1G
     lxd:
-      branch: lp:~openstack-charmers-next/charms/trusty/lxd/trunk
+      branch: https://github.com/openstack/charm-lxd
       options:
         block-device: /dev/vdb
         ephemeral-unmount: /mnt
 
=== 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
 
=== 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-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-29 17:26:34 +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-29 17:26:34 +0000
@@ -0,0 +1,185 @@
+# 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: lp:charms/trusty/mysql
+      #https://github.com/openstack/charm-percona-cluster
+      constraints: mem=1G
+      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"
+        ram-allocation-ratio: 5.0
+    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
+    swift-proxy:
+      branch: https://github.com/openstack/charm-swift-proxy;stable
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    swift-storage-z1:
+      branch: https://github.com/openstack/charm-swift-storage;stable
+      constraints: mem=1G
+      options:
+        zone: 1
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z2:
+      branch: https://github.com/openstack/charm-swift-storage;stable
+      constraints: mem=1G
+      options:
+        zone: 2
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z3:
+      branch: https://github.com/openstack/charm-swift-storage;stable
+      constraints: mem=1G
+      options:
+        zone: 3
+        block-device: vdb
+        overwrite: "true"
+    ceilometer:
+      branch: https://github.com/openstack/charm-ceilometer;stable
+      constraints: mem=1G
+    ceilometer-agent:
+      branch: https://github.com/openstack/charm-ceilometer-agent;stable
+    heat:
+      branch: https://github.com/openstack/charm-heat;stable
+    mongodb:
+      branch: lp:charms/trusty/mongodb;stable
+      constraints: mem=1G
+    lxd:
+      branch: https://github.com/openstack/charm-lxd
+      options:
+        block-device: /dev/vdb
+        ephemeral-unmount: /mnt
+        storage-type: lvm
+  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, lxd ]
+    - [ nova-compute, mysql ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ glance, rabbitmq-server ]
+    - [ glance, swift-proxy ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+    - [ swift-proxy, keystone ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - - ceilometer
+      - keystone:identity-service
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ heat, mysql ]
+    - [ heat, keystone ]
+    - [ heat, rabbitmq-server ]
+openstack-singlerabbit:
+  inherits: openstack-services
+  relations:
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+openstack-icehouse:
+  inherits: openstack-singlerabbit
+  services:
+    neutron-api:
+      branch: https://github.com/openstack/charm-neutron-api;stable
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: https://github.com/openstack/charm-neutron-openvswitch;stable
+  relations:
+  - [ 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-icehouse
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-liberty.yaml
+wily-liberty:
+  inherits: openstack-liberty-git
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+trusty-liberty:
+  inherits: openstack-liberty-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+# mitaka
+openstack-master-git:
+  inherits: openstack-icehouse
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+xenial-mitaka:
+  inherits: openstack-master-git
+  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/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
 
=== removed file 'bundles/lxd/source/lxd.yaml'
--- bundles/lxd/source/lxd.yaml	2016-03-11 09:33:21 +0000
+++ bundles/lxd/source/lxd.yaml	1970-01-01 00:00:00 +0000
@@ -1,367 +0,0 @@
-# vim: set ts=2 et:
-# deployer bundle for development ('lxd') 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=1G
-      options:
-        dataset-size: 50%
-        max-connections: 20000
-    rabbitmq-server:
-      branch: https://github.com/openstack/charm-rabbitmq-server
-      constraints: mem=1G
-    ceph:
-      branch: https://github.com/openstack/charm-ceph
-      num_units: 3
-      constraints: mem=1G
-      options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
-        ephemeral-unmount: /mnt
-    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: lp:~zulcss/charms/trusty/nova-compute/nova-compute-lxd
-      num_units: 3
-      constraints: mem=4G
-      options:
-        enable-live-migration: True
-        enable-resize: True
-        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
-    cinder:
-      branch: https://github.com/openstack/charm-cinder
-      options:
-        block-device: "None"
-        glance-api-version: 2
-      constraints: mem=1G
-#    cinder-ceph:
-#      branch: https://github.com/openstack/charm-cinder-ceph
-    glance:
-      branch: https://github.com/openstack/charm-glance
-      constraints: mem=1G
-    swift-proxy:
-      branch: https://github.com/openstack/charm-swift-proxy
-      constraints: mem=1G
-      options:
-        zone-assignment: manual
-        replicas: 3
-        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-    swift-storage-z1:
-      branch: https://github.com/openstack/charm-swift-storage
-      constraints: mem=1G
-      options:
-        zone: 1
-        block-device: vdb
-        overwrite: "true"
-    swift-storage-z2:
-      branch: https://github.com/openstack/charm-swift-storage
-      constraints: mem=1G
-      options:
-        zone: 2
-        block-device: vdb
-        overwrite: "true"
-    swift-storage-z3:
-      branch: https://github.com/openstack/charm-swift-storage
-      constraints: mem=1G
-      options:
-        zone: 3
-        block-device: vdb
-        overwrite: "true"
-    ceilometer:
-      branch: https://github.com/openstack/charm-ceilometer
-      constraints: mem=1G
-    ceilometer-agent:
-      branch: https://github.com/openstack/charm-ceilometer-agent
-    heat:
-      branch: https://github.com/openstack/charm-heat
-    mongodb:
-      branch: lp:charms/trusty/mongodb
-      constraints: mem=1G
-    lxd:
-      branch: lp:~zulcss/+junk/lxd-container
-      options:
-        lxd-block-device: /mnt/disk.img|20G
-        lxd-origin: ppa:ubuntu-lxc/lxd-git-master
-        lxd-use-source: True
-        lxd-trust-password: blah
-  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 ]
-    - [ nova-compute, ceph ]
-    - [ glance, mysql ]
-    - [ glance, keystone ]
-    - [ glance, ceph ]
-    - [ glance, cinder ]
-    - [ cinder, mysql ]
-    - [ cinder, rabbitmq-server ]
-    - [ cinder, nova-cloud-controller ]
-    - [ cinder, keystone ]
-    - [ cinder, ceph ]
-#    - [ cinder, cinder-ceph ]
-#    - [ cinder-ceph, ceph ]
-    - [ neutron-gateway, nova-cloud-controller ]
-    - [ openstack-dashboard, keystone ]
-    - [ swift-proxy, keystone ]
-    - [ swift-proxy, swift-storage-z1 ]
-    - [ swift-proxy, swift-storage-z2 ]
-    - [ swift-proxy, swift-storage-z3 ]
-    - - ceilometer
-      - keystone:identity-service
-    - [ ceilometer, rabbitmq-server ]
-    - [ ceilometer, mongodb ]
-    - [ ceilometer-agent, nova-compute ]
-    - [ ceilometer-agent, ceilometer ]
-    - [ heat, mysql ]
-    - [ heat, keystone ]
-    - [ heat, rabbitmq-server ]
-openstack-singlerabbit:
-  inherits: openstack-services
-  relations:
-    - [ "neutron-gateway:amqp", rabbitmq-server ]
-openstack-icehouse:
-  inherits: openstack-singlerabbit
-  services:
-    neutron-api:
-      branch: https://github.com/openstack/charm-neutron-api
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: https://github.com/openstack/charm-neutron-openvswitch
-  relations:
-  - [ 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 ]
-openstack-icehouse-msg-split:
-  inherits: openstack-services
-  services:
-    neutron-api:
-      branch: https://github.com/openstack/charm-neutron-api
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: https://github.com/openstack/charm-neutron-openvswitch
-    rabbitmq-server-neutron:
-      branch: https://github.com/openstack/charm-rabbitmq-server;stable
-      constraints: mem=1G
-  relations:
-  - [ neutron-api, mysql ]
-  - [ neutron-api, rabbitmq-server-neutron ]
-  - [ neutron-api, nova-cloud-controller ]
-  - [ neutron-api, neutron-openvswitch ]
-  - [ neutron-api, keystone ]
-  - [ neutron-api, neutron-gateway ]
-  - [ neutron-openvswitch, nova-compute ]
-  - [ neutron-openvswitch, rabbitmq-server-neutron ]
-  - [ "neutron-gateway:amqp-nova", rabbitmq-server ]
-  - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
-# icehouse
-openstack-icehouse-git:
-  inherits: openstack-icehouse
-  services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-icehouse.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-icehouse.yaml
-    cinder:
-      options:
-        openstack-origin-git: include-file://cinder-icehouse.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-icehouse.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-icehouse.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-icehouse.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-icehouse.yaml
-    nova-compute:
-      options:
-        openstack-origin-git: include-file://nova-icehouse.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-icehouse.yaml
-precise-icehouse:
-  inherits: openstack-icehouse-git
-  series: precise
-  overrides:
-    openstack-origin: cloud:precise-icehouse
-    source: cloud:precise-icehouse
-trusty-icehouse:
-  inherits: openstack-icehouse-git
-  series: trusty
-# juno
-openstack-juno-git:
-  inherits: openstack-icehouse
-  services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-juno.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-juno.yaml
-    cinder:
-      options:
-        openstack-origin-git: include-file://cinder-juno.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-juno.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-juno.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-juno.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-juno.yaml
-    nova-compute:
-      options:
-        openstack-origin-git: include-file://nova-juno.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-juno.yaml
-trusty-juno:
-  inherits: openstack-juno-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-juno
-    source: cloud:trusty-juno
-utopic-juno:
-  inherits: openstack-juno-git
-  series: utopic
-# kilo
-openstack-kilo-git:
-  inherits: openstack-icehouse
-  services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-kilo.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-kilo.yaml
-    cinder:
-      options:
-        openstack-origin-git: include-file://cinder-kilo.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-kilo.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-kilo.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-kilo.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-kilo.yaml
-    nova-compute:
-      options:
-        openstack-origin-git: include-file://nova-kilo.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-kilo.yaml
-trusty-kilo:
-  inherits: openstack-kilo-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo
-    source: cloud:trusty-kilo
-trusty-kilo-proposed:
-  inherits: openstack-kilo-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo/proposed
-    source: cloud:trusty-kilo/proposed
-vivid-kilo:
-  inherits: openstack-kilo-git
-  series: vivid
-# master
-openstack-master-git:
-  inherits: openstack-icehouse
-  services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-master.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-master.yaml
-    cinder:
-      options:
-        openstack-origin-git: include-file://cinder-master.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-master.yaml
-    nova-compute:
-      options:
-        openstack-origin-git: include-file://nova-master.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-master.yaml
-trusty-master:
-  inherits: openstack-master-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo
-    source: cloud:trusty-kilo
-trusty-master-proposed:
-  inherits: openstack-master-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo/proposed
-    source: cloud:trusty-kilo/proposed
-vivid-master:
-  inherits: openstack-master-git
-  series: vivid
 
=== 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
 
=== renamed file 'bundles/lxd/lxd.yaml' => 'bundles/lxd/source/next.yaml'
--- bundles/lxd/lxd.yaml	2016-03-11 09:33:21 +0000
+++ bundles/lxd/source/next.yaml	2016-03-29 17:26:34 +0000
@@ -4,13 +4,12 @@
 openstack-services:
   services:
     mysql:
-      branch: https://github.com/openstack/charm-percona-cluster
-      constraints: mem=4G
+      branch: lp:charms/trusty/mysql
+      #https://github.com/openstack/charm-percona-cluster
+      constraints: mem=1G
       options:
         dataset-size: 50%
         max-connections: 20000
-#        root-password: changeme
-#        sst-password: changeme
     rabbitmq-server:
       branch: https://github.com/openstack/charm-rabbitmq-server
       constraints: mem=1G
@@ -25,7 +24,7 @@
       constraints: mem=1G
     nova-compute:
       branch: https://github.com/openstack/charm-nova-compute
-      num_units: 1
+      num_units: 3
       constraints: mem=4G
       options:
         enable-live-migration: True
@@ -38,6 +37,7 @@
       options:
         network-manager: Neutron
         quantum-security-groups: "yes"
+        ram-allocation-ratio: 5.0
     neutron-gateway:
       branch: https://github.com/openstack/charm-neutron-gateway
       constraints: mem=1G
@@ -46,12 +46,50 @@
     glance:
       branch: https://github.com/openstack/charm-glance
       constraints: mem=1G
+    swift-proxy:
+      branch: https://github.com/openstack/charm-swift-proxy
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    swift-storage-z1:
+      branch: https://github.com/openstack/charm-swift-storage
+      constraints: mem=1G
+      options:
+        zone: 1
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z2:
+      branch: https://github.com/openstack/charm-swift-storage
+      constraints: mem=1G
+      options:
+        zone: 2
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z3:
+      branch: https://github.com/openstack/charm-swift-storage
+      constraints: mem=1G
+      options:
+        zone: 3
+        block-device: vdb
+        overwrite: "true"
+    ceilometer:
+      branch: https://github.com/openstack/charm-ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      branch: https://github.com/openstack/charm-ceilometer-agent
+    heat:
+      branch: https://github.com/openstack/charm-heat
+    mongodb:
+      branch: lp:charms/trusty/mongodb
+      constraints: mem=1G
     lxd:
-      branch: lp:~zulcss/charms/trusty/lxd/lxd-2.0
+      branch: https://github.com/openstack/charm-lxd
       options:
-        block-device: /mnt/disk.img|20G
-        storage-type: btrfs
-        lxd-origin: ppa:ubuntu-lxc/lxd-git-master
+        block-device: /dev/vdb
+        ephemeral-unmount: /mnt
+        storage-type: lvm
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -59,15 +97,30 @@
     - [ nova-cloud-controller, glance ]
     - [ nova-cloud-controller, keystone ]
     - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, lxd ]
     - [ nova-compute, mysql ]
-    - [ nova-compute, lxd ]
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
     - [ glance, mysql ]
     - [ glance, keystone ]
+    - [ glance, rabbitmq-server ]
+    - [ glance, swift-proxy ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
+    - [ swift-proxy, keystone ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - - ceilometer
+      - keystone:identity-service
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ heat, mysql ]
+    - [ heat, keystone ]
+    - [ heat, rabbitmq-server ]
 openstack-singlerabbit:
   inherits: openstack-services
   relations:
@@ -91,242 +144,42 @@
   - [ neutron-api, neutron-gateway ]
   - [ neutron-openvswitch, nova-compute ]
   - [ neutron-openvswitch, rabbitmq-server ]
-openstack-icehouse-msg-split:
-  inherits: openstack-services
-  services:
-    neutron-api:
-      branch: https://github.com/openstack/charm-neutron-api
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: https://github.com/openstack/charm-neutron-openvswitch
-    rabbitmq-server-neutron:
-      branch: https://github.com/openstack/charm-rabbitmq-server;stable
-      constraints: mem=1G
-  relations:
-  - [ neutron-api, mysql ]
-  - [ neutron-api, rabbitmq-server-neutron ]
-  - [ neutron-api, nova-cloud-controller ]
-  - [ neutron-api, neutron-openvswitch ]
-  - [ neutron-api, keystone ]
-  - [ neutron-api, neutron-gateway ]
-  - [ neutron-openvswitch, nova-compute ]
-  - [ neutron-openvswitch, rabbitmq-server-neutron ]
-  - [ "neutron-gateway:amqp-nova", rabbitmq-server ]
-  - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
-# icehouse
-openstack-icehouse-git:
-  inherits: openstack-icehouse
-  services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-icehouse.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-icehouse.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-icehouse.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-icehouse.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-icehouse.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-icehouse.yaml
-    nova-compute:
-      options:
-        openstack-origin-git: include-file://nova-icehouse.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-icehouse.yaml
-precise-icehouse:
-  inherits: openstack-icehouse-git
-  series: precise
-  services:
-    mysql:
-      branch: lp:charms/trusty/mysql
-  overrides:
-    openstack-origin: cloud:precise-icehouse
-    source: cloud:precise-icehouse
-trusty-icehouse:
-  inherits: openstack-icehouse-git
-  series: trusty
-# juno
-openstack-juno-git:
-  inherits: openstack-icehouse
-  services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-juno.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-juno.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-juno.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-juno.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-juno.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-juno.yaml
-    nova-compute:
-      options:
-        openstack-origin-git: include-file://nova-juno.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-juno.yaml
-trusty-juno:
-  inherits: openstack-juno-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-juno
-    source: cloud:trusty-juno
-utopic-juno:
-  inherits: openstack-juno-git
-  series: utopic
-# kilo
-openstack-kilo-git:
-  inherits: openstack-icehouse
-  services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-kilo.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-kilo.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-kilo.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-kilo.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-kilo.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-kilo.yaml
-    nova-compute:
-      options:
-        openstack-origin-git: include-file://nova-kilo.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-kilo.yaml
-trusty-kilo:
-  inherits: openstack-kilo-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo
-    source: cloud:trusty-kilo
-trusty-kilo-proposed:
-  inherits: openstack-kilo-git
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo/proposed
-    source: cloud:trusty-kilo/proposed
-vivid-kilo:
-  inherits: openstack-kilo-git
-  series: vivid
-  services:
-    mysql:
-      branch: lp:charms/trusty/mysql
 # liberty
 openstack-liberty-git:
   inherits: openstack-icehouse
   services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-liberty.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-liberty.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-liberty.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-liberty.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-liberty.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-liberty.yaml
     nova-compute:
       options:
         openstack-origin-git: include-file://nova-liberty.yaml
-    nova-cloud-controller:
-      options:
-        openstack-origin-git: include-file://nova-liberty.yaml
+wily-liberty:
+  inherits: openstack-liberty-git
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
 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
+# mitaka
 openstack-master-git:
   inherits: openstack-icehouse
   services:
-    keystone:
-      options:
-        openstack-origin-git: include-file://keystone-master.yaml
-    glance:
-      options:
-        openstack-origin-git: include-file://glance-master.yaml
-    neutron-api:
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-    neutron-gateway:
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-    neutron-openvswitch:
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-    openstack-dashboard:
-      options:
-        openstack-origin-git: include-file://horizon-master.yaml
     nova-compute:
       options:
         openstack-origin-git: include-file://nova-master.yaml
-    nova-cloud-controller:
-      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-master:
+xenial-mitaka:
   inherits: openstack-master-git
   series: xenial
   services:
     mysql:
       branch: lp:charms/trusty/mysql
+xenial-mitaka-proposed:
+  inherits: xenial-mitaka
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
 
=== renamed file 'bundles/lxd/nova-liberty.yaml' => 'bundles/lxd/source/nova-liberty.yaml'
--- bundles/lxd/nova-liberty.yaml	2016-02-19 16:49:21 +0000
+++ bundles/lxd/source/nova-liberty.yaml	2016-03-29 17:26:34 +0000
@@ -1,10 +1,13 @@
 repositories:
   - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: stable/liberty}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
-     branch: stable/liberty}
+     repository: 'git://github.com/zulcss/requirements',
+     branch: stable/liberty}
+  - {name: pylxd,
+     repository: 'https://github.com/lxc/pylxd',
+     branch: master}
+  - {name: nova-compute-lxd,
+     repository: 'https://github.com/lxc/nova-lxd',
+     branch: master}
   - {name: nova,
      repository: 'git://github.com/openstack/nova',
      branch: stable/liberty}
 
=== modified 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	2016-03-29 17:26:34 +0000
@@ -1,15 +1,12 @@
 repositories:
   - {name: requirements,
-     repository: 'git://github.com/openstack/requirements',
-     branch: master}
-  - {name: neutron,
-     repository: 'git://github.com/openstack/neutron',
+     repository: 'git://github.com/zulcss/requirements',
      branch: master}
   - {name: pylxd,
      repository: 'https://github.com/lxc/pylxd',
      branch: master}
   - {name: nova-compute-lxd,
-     repository: 'https://github.com/lxc/nova-compute-lxd',
+     repository: 'https://github.com/lxc/nova-lxd',
      branch: master}
   - {name: nova,
      repository: 'git://github.com/openstack/nova',