ceph-osd: add support for --journal vg/lv for lvm osds

This also updates the tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/ceph-osd/tasks/scenarios/lvm.yml b/roles/ceph-osd/tasks/scenarios/lvm.yml
index a1c5994c9470920f274c5383c8c10a38c821250b..bd2936a2f1b3a8375e4ce5e13fad598da3c59ae1 100644 (file)
--- a/roles/ceph-osd/tasks/scenarios/lvm.yml
+++ b/roles/ceph-osd/tasks/scenarios/lvm.yml
@@ -2,3 +2,11 @@
 - name: use ceph-volume to create filestore osds with dedicated journals
   command: "ceph-volume lvm create --filestore --data {{ item.data_vg }}/{{ item.data }} --journal {{ item.journal }}"
   with_items: "{{ lvm_volumes }}"
+  when:
+    - item.journal_vg is not defined
+
+- name: use ceph-volume to create filestore osds with dedicated lv journals
+  command: "ceph-volume lvm create --filestore --data {{ item.data_vg }}/{{ item.data }} --journal {{item.journal_vg }}/{{ item.journal }}"
+  with_items: "{{ lvm_volumes }}"
+  when:
+    - item.journal_vg is defined

diff --git a/tests/functional/centos/7/lvm-osds/group_vars/all b/tests/functional/centos/7/lvm-osds/group_vars/all
index 799b778da5b0d8a4fdd8cce4d97c283e2edae157..2bcf30c1fb49f05e6346c8b3442c9f62f67bc52a 100644 (file)
--- a/tests/functional/centos/7/lvm-osds/group_vars/all
+++ b/tests/functional/centos/7/lvm-osds/group_vars/all
@@ -1,6 +1,7 @@
 ---
 
-ceph_stable: True
+ceph_origin: repository
+ceph_repository: community
 cluster: ceph
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
@@ -12,9 +13,13 @@ osd_scenario: lvm
 copy_admin_key: true
 # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
 lvm_volumes:
-  - data: test_volume
-    journal: /dev/sdc
+  - data: data-lv1
+    journal: /dev/sdc1
     data_vg: test_group
+  - data: data-lv2
+    journal: journal1
+    data_vg: test_group
+    journal_vg: journals
 os_tuning_params:
   - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }