From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 3 Mar 2017 07:09:06 +0000 (-0600)
Subject: adding few enhancement for LXD to use /dev/sdb devices.
X-Git-Tag: danube.1.0~13
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8f2baac1f14a5b3503d8086053189010de7ead2d;p=joid.git

adding few enhancement for LXD to use /dev/sdb devices.

Change-Id: Ib005e41ef52e5d3f32397480c4c13e8996ba2701
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 2d9ffbe4..f3c35d05 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -68,7 +68,11 @@
 {% endif %}
 {% endif %}
       options:
+{% if os.lxd %}
+        osd-devices: /srv/ceph-osd
+{% else %}
         osd-devices: {{ opnfv.storage_dict.ceph.disk }}
+{% endif %}
         osd-reformat: 'yes'
 {% if ubuntu.release == 'trusty' and os.release < 'newton' %}
         source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index 2e0f7876..c9378d91 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -73,6 +73,11 @@
     lxd:
       charm: ./{{ ubuntu.release }}/lxd
       options:
+{% if 'srv' not in opnfv.storage_dict.ceph.disk %}
+        block-devices: {{ opnfv.storage_dict.ceph.disk }}
+        overwrite: true
+        storage-type: zfs
+{% endif %}
 {% endif %}
 {% if opnfv.storage_dict.scaleio is defined %}
     scaleio-openstack: