diff options
Diffstat (limited to 'ci/config_tpl/juju2')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | 5 |
2 files changed, 9 insertions, 0 deletions
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: |