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

[Chuck Short]

Add support for stable/mitaka

=== modified file 'bundles/lxd/source/default.yaml'
--- bundles/lxd/source/default.yaml	2016-03-29 17:18:18 +0000
+++ bundles/lxd/source/default.yaml	2016-04-05 14:42:59 +0000
@@ -90,6 +90,7 @@
         block-device: /dev/vdb
         ephemeral-unmount: /mnt
         storage-type: lvm
+        overwrite: "true"
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -165,15 +166,33 @@
   overrides:
     openstack-origin: cloud:trusty-liberty
     source: cloud:trusty-liberty
-# mitaka
+# master
 openstack-master-git:
   inherits: openstack-icehouse
   services:
     nova-compute:
       options:
         openstack-origin-git: include-file://nova-master.yaml
+xenial-master:
+  inherits: openstack-master-git
+  series: xenial
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+xenial-master-proposed:
+  inherits: xenial-master
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# mitaka
+openstack-mitaka-git:
+  inherits: openstack-icehouse
+  services:
+    nova-compute:
+       options:
+         openstack-origin-git: include-file://nova-mitaka.yaml
 xenial-mitaka:
-  inherits: openstack-master-git
+  inherits: openstack-mitaka-git
   series: xenial
   services:
     mysql:
 
=== modified file 'bundles/lxd/source/next.yaml'
--- bundles/lxd/source/next.yaml	2016-03-29 15:44:36 +0000
+++ bundles/lxd/source/next.yaml	2016-04-05 14:42:59 +0000
@@ -90,6 +90,7 @@
         block-device: /dev/vdb
         ephemeral-unmount: /mnt
         storage-type: lvm
+        overwrite: "true"
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -165,20 +166,38 @@
   overrides:
     openstack-origin: cloud:trusty-liberty
     source: cloud:trusty-liberty
-# mitaka
+# master
 openstack-master-git:
   inherits: openstack-icehouse
   services:
     nova-compute:
       options:
         openstack-origin-git: include-file://nova-master.yaml
+xenial-master:
+  inherits: openstack-master-git
+  series: xenial
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+xenial-master-proposed:
+  inherits: xenial-master
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# mitaka
+openstack-mitaka-git:
+  inherits: openstack-icehouse
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-mitaka.yaml
 xenial-mitaka:
   inherits: openstack-master-git
   series: xenial
   services:
     mysql:
       branch: lp:charms/trusty/mysql
-xenial-mitaka-proposed:
+xenial-master-proposed:
   inherits: xenial-mitaka
   overrides:
     source: proposed
 
=== added file 'bundles/lxd/source/nova-mitaka.yaml'
--- bundles/lxd/source/nova-mitaka.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/nova-mitaka.yaml	2016-04-05 14:42:59 +0000
@@ -0,0 +1,16 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: stable/mitaka}
+  - {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/mitaka}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128