From 12139b5b42424d700c464fda070958f2bf30fb41 Mon Sep 17 00:00:00 2001
From: Francesco Pantano <fpantano@redhat.com>
Date: Sun, 8 Aug 2021 12:08:58 +0200
Subject: [PATCH] Configure Ceph to not use separte db/wal LVs

Depends-On: Ie71b88ef7305c600a63a4765a719890aab337907
Change-Id: I116a0e9d7fadca525c1e8f5328df77235379c09c
(cherry picked from commit 11d7b8ad499faa5c231fbda15da4e680bd4894e5)
---
 ci/environments/scenario001-multinode-containers.yaml | 9 +++++----
 ci/environments/scenario001-standalone.yaml           | 4 ----
 ci/environments/scenario004-standalone.yaml           | 4 ----
 ci/environments/scenario010-multinode-containers.yaml | 4 ----
 ci/environments/scenario010-standalone.yaml           | 4 ----
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index cb3f067eb1..3b96d60789 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -120,10 +120,11 @@ 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
   CephPoolDefaultPgNum: 32
   CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
   CephPoolDefaultSize: 1
diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index 785a380218..2ba7274482 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -65,10 +65,6 @@ parameter_defaults:
     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
   CephPoolDefaultSize: 1
   CephEnableDashboard: true
diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index 054445c498..b1d8c01b21 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -39,10 +39,6 @@ parameter_defaults:
     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
   CephPoolDefaultSize: 1
   CephAnsibleExtraConfig:
diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml
index cf92b877a7..a35197554c 100644
--- a/ci/environments/scenario010-multinode-containers.yaml
+++ b/ci/environments/scenario010-multinode-containers.yaml
@@ -85,10 +85,6 @@ parameter_defaults:
     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
   CephPoolDefaultSize: 1
   CephPools:
diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml
index 7b5ed2dd2d..1ce063e298 100644
--- a/ci/environments/scenario010-standalone.yaml
+++ b/ci/environments/scenario010-standalone.yaml
@@ -41,10 +41,6 @@ parameter_defaults:
     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
   CephPoolDefaultSize: 1
   CephAnsibleExtraConfig: