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

[Chuck Short]

Add cinder support for nova-lxd

=== modified file 'bundles/lxd/next.yaml'
--- bundles/lxd/next.yaml	2016-07-14 20:09:48 +0000
+++ bundles/lxd/next.yaml	2016-09-26 13:17:35 +0000
@@ -43,6 +43,14 @@
         flat-network-providers: physnet1
     neutron-openvswitch:
       branch: https://github.com/openstack/charm-neutron-openvswitch
+    cinder:
+      branch: https://github.com/openstack/charm-cinder
+      options:
+        block-device: /dev/vdb
+        glance-api-version: 2
+        ephemeral-unmount: /mnt
+        overwrite: "true"
+      constraints: mem=4G
     glance:
       branch: https://github.com/openstack/charm-glance
       constraints: mem=1G
@@ -106,6 +114,11 @@
     - [ glance, mysql ]
     - [ glance, keystone ]
     - [ glance, rabbitmq-server ]
+    - [ glance, "cinder:image-service" ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]