From bef793e50310695a94b004005ecf0fd6b538323c Mon Sep 17 00:00:00 2001
From: John Fulton <fulton@redhat.com>
Date: Fri, 27 Mar 2020 10:46:24 -0400
Subject: [PATCH] Switch scenario001-multinode-containers to LVM-based
 bluestore

scenario001-multinode was still using a loopback device directly
which is no longer supported as per the move to ceph-volume which
was documented in RH BZ 1666822. scenario00{1,4}-standalone were
updated to deal with this by passing precreated lvm_volumes to
CephAnsibleDisksConfig but scenario001-multinode was not. This
change brings it back up to date for deploying bluestore with
ceph-volume.

Change-Id: I1f0420b8d48d9a2e8327c78daf48449537e3b842
---
 .../scenario001-multinode-containers.yaml           | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index d951522dab..a2d5e3806c 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -124,10 +124,15 @@ parameter_defaults:
   Debug: true
   DockerPuppetDebug: True
   CephAnsibleDisksConfig:
-    devices:
-      - /dev/loop3
-    journal_size: 512
-    osd_scenario: collocated
+    osd_objectstore: bluestore
+    osd_scenario: lvm
+    lvm_volumes:
+      - data: ceph_lv_data
+        data_vg: ceph_vg
+        db: ceph_lv_db
+        db_vg: ceph_vg
+        wal: ceph_lv_wal
+        wal_vg: ceph_vg
   CephPoolDefaultPgNum: 32
   CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
   CephPoolDefaultSize: 1