Merge lp:~cpe-sa/sademos/16.04-LXD-ZFS-Fixes into lp:sademos/16.04

[mahmoh]

These are the bundle changes required for NCLXD to work as of today, the rabbit charm will need to move back from -next, ideally test without -next and see if that works as I think it now should but only if time permits.

Unmerged revisions

94. By mahmoh on 2016-04-22

NC-LXD fixes for ZFS support.

=== modified file 'openstack/nclxd/nclxd.yaml'
--- openstack/nclxd/nclxd.yaml	2016-04-22 00:18:27 +0000
+++ openstack/nclxd/nclxd.yaml	2016-04-22 20:04:23 +0000
@@ -1,7 +1,7 @@
 series: xenial
 services: 
   "rabbitmq-server": 
-    charm: "cs:~openstack-charmers/xenial/rabbitmq-server"
+    charm: "cs:~openstack-charmers-next/xenial/rabbitmq-server"
     series: xenial
     num_units: 1
     annotations: 
@@ -13,9 +13,9 @@
     charm: "cs:xenial/lxd"
     series: xenial
     options: 
-      "block-device": /dev/sdb
+      "block-devices": /dev/sdb
       overwrite: true
-      "storage-type": lvm
+      "storage-type": zfs
     annotations: 
       "gui-x": "750"
       "gui-y": "250"