Merge lp:~rockstar/openstack-charm-testing/block-devices into lp:openstack-charm-testing

[Paul Hummer]

Change the lxd config to block-devices (to go with this patch: https://review.openstack.org/#/c/305896/)

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'bundles/lxd/next.yaml'
--- bundles/lxd/next.yaml	2016-04-11 16:58:52 +0000
+++ bundles/lxd/next.yaml	2016-04-18 14:06:55 +0000
@@ -86,7 +86,7 @@
     lxd:
       branch: https://github.com/openstack/charm-lxd
       options:
-        block-device: /dev/vdb
+        block-devices: /dev/vdb
         ephemeral-unmount: /mnt
         storage-type: lvm
         overwrite: "true"

=== modified file 'bundles/lxd/source/next.yaml'
--- bundles/lxd/source/next.yaml	2016-04-11 16:58:52 +0000
+++ bundles/lxd/source/next.yaml	2016-04-18 14:06:55 +0000
@@ -86,7 +86,7 @@
     lxd:
       branch: https://github.com/openstack/charm-lxd
       options:
-        block-device: /dev/vdb
+        block-devices: /dev/vdb
         ephemeral-unmount: /mnt
         storage-type: lvm
         overwrite: "true"

=== modified file 'bundles/multi-hypervisor/next.yaml'
--- bundles/multi-hypervisor/next.yaml	2016-04-11 16:58:20 +0000
+++ bundles/multi-hypervisor/next.yaml	2016-04-18 14:06:55 +0000
@@ -49,7 +49,7 @@
     lxd:
       branch: https://github.com/openstack/charm-lxd
       options:
-        block-device: /dev/vdb
+        block-devices: /dev/vdb
         ephemeral-unmount: /mnt
         storage-type: lvm
         overwrite: "true"