diff --git a/scripts/ceph-standalone-deploy/ceph-disk-list.py b/scripts/ceph-standalone-deploy/ceph-disk-list.py
index 760d1f012f023f799590949e7e2e6242c13da07b..7b20a55acb378cc5fbea8a83d6ed7839e39f5fe1 100755
--- a/scripts/ceph-standalone-deploy/ceph-disk-list.py
+++ b/scripts/ceph-standalone-deploy/ceph-disk-list.py
@@ -141,8 +141,8 @@ if pattern.match(args.wal) and pattern.match(args.db) and pattern.match(args.dat
 
         sed_string = sed_string + "\ \ \ \ \ \ \'\"'\"'"+str(bayid)+"-"+sn+"-"+vnd+"-"+prd+"/"+dev+"_data\'\"'\"'=> \
         {\\n \ \ \ \ \ \ \ \ store_type => '\"'\"'bluestore'\"'\"',\
-        \\n \ \ \ \ \ \ \ \ bluestore_wal => '\"'\"'"+dev+"_wal'"+"/"+vg_name_ssd+"\"'\"',\
-        \\n \ \ \ \ \ \ \ \ bluestore_db => '\"'\"'"+dev+"_db'"+"/"+vg_name_ssd+"\"'\"',\
+        \\n \ \ \ \ \ \ \ \ bluestore_wal => '\"'\"'"+vg_name_ssd+"/"+dev+"_wal'"+"\"'\"',\
+        \\n \ \ \ \ \ \ \ \ bluestore_db => '\"'\"'"+vg_name_ssd+"/"+dev+"_db'"+"\"'\"',\
         \\n \ \ \ \ \ \ \ \ ensure     => '\"'\"'present'\"'\"',\\n \ \ \ \ \ \},\\n"
 
     sed_string = sed_string + "\ \ \ \ \},"
diff --git a/scripts/ceph-standalone-deploy/disk-partitions.py b/scripts/ceph-standalone-deploy/disk-partitions.py
index e65da147873548a27cf91bf477da24a571b63f56..39e690f152ebf45c0d9b106cf1c6300905231ecd 100755
--- a/scripts/ceph-standalone-deploy/disk-partitions.py
+++ b/scripts/ceph-standalone-deploy/disk-partitions.py
@@ -24,7 +24,7 @@ if args.wal == None or args.db == None or args.data == None:
     sys.exit(1)
 
 
-dry_run = True
+dry_run = False
 
 s = args.ssd
 ssd_list = []
diff --git a/scripts/ceph-standalone-deploy/diskPosition2.out b/scripts/ceph-standalone-deploy/diskPosition2.out
index 2321dcb980fe36020e19d669be05acb19f911029..74ec761935b17b328836d0180fdbb5ab70fa48fb 100644
--- a/scripts/ceph-standalone-deploy/diskPosition2.out
+++ b/scripts/ceph-standalone-deploy/diskPosition2.out
@@ -1,90 +1,90 @@
-/sys/block/sdaa Enclosure: 0x500304801ef3ae7f BayID: 23 - Serial number:        2EGYV57X - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdaa Enclosure: 0x500304801ef3ab7f BayID: 23 - Serial number:        2EH3N2JX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:23/end_device-11:0:23/sas_device/end_device-11:0:23
 
-/sys/block/sdab Enclosure: 0x500304801ef3ae7f BayID: 24 - Serial number:        2EGHJGNX - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdab Enclosure: 0x500304801ef3ab7f BayID: 24 - Serial number:        2EH3GSNX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:24/end_device-11:0:24/sas_device/end_device-11:0:24
 
-/sys/block/sdac Enclosure: 0x500304801ef3ae7f BayID: 25 - Serial number:        2EH15P4X - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdac Enclosure: 0x500304801ef3ab7f BayID: 25 - Serial number:        2EGYZX1X - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:25/end_device-11:0:25/sas_device/end_device-11:0:25
 
-/sys/block/sdad Enclosure: 0x500304801ef3ae7f BayID: 26 - Serial number:        2EGZ3K1X - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdad Enclosure: 0x500304801ef3ab7f BayID: 26 - Serial number:        2EH87DSV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:26/end_device-11:0:26/sas_device/end_device-11:0:26
 
-/sys/block/sdae Enclosure: 0x500304801ef3ae7f BayID: 27 - Serial number:        2EH0MTYX - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdae Enclosure: 0x500304801ef3ab7f BayID: 27 - Serial number:        2EGP9Z4V - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:27/end_device-11:0:27/sas_device/end_device-11:0:27
 
-/sys/block/sdaf Enclosure: 0x500304801ef3ae7f BayID: 28 - Serial number:        2EH2559X - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdaf Enclosure: 0x500304801ef3ab7f BayID: 28 - Serial number:        2EGKBRAV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:28/end_device-11:0:28/sas_device/end_device-11:0:28
 
-/sys/block/sdag Enclosure: 0x500304801ef3ae7f BayID: 29 - Serial number:        2EGVKABX - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdag Enclosure: 0x500304801ef3ab7f BayID: 29 - Serial number:        2EH5WTUV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:29/end_device-11:0:29/sas_device/end_device-11:0:29
 
-/sys/block/sdd Enclosure: 0x500304801ef3ae7f BayID: 0 - Serial number:        ZA1D4Q180000C9054BTH - Vendor:               SEAGATE Product:              ST8000NM0065
+/sys/block/sdd Enclosure: 0x500304801ef3ab7f BayID: 0 - Serial number:        2EH13V4X - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:0/end_device-11:0:0/sas_device/end_device-11:0:0
 
-/sys/block/sde Enclosure: 0x500304801ef3ae7f BayID: 1 - Serial number:        ZA1D4PNR0000C9057BAH - Vendor:               SEAGATE Product:              ST8000NM0065
+/sys/block/sde Enclosure: 0x500304801ef3ab7f BayID: 1 - Serial number:        2EGRN53V - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:1/end_device-11:0:1/sas_device/end_device-11:0:1
 
-/sys/block/sdf Enclosure: 0x500304801ef3ae7f BayID: 2 - Serial number:        ZA1D30NN0000C90503WV - Vendor:               SEAGATE Product:              ST8000NM0065
+/sys/block/sdf Enclosure: 0x500304801ef3ab7f BayID: 2 - Serial number:        2EGSSBLX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:2/end_device-11:0:2/sas_device/end_device-11:0:2
 
-/sys/block/sdg Enclosure: 0x500304801ef3ae7f BayID: 3 - Serial number:        ZA1D30XX0000C90502KD - Vendor:               SEAGATE Product:              ST8000NM0065
+/sys/block/sdg Enclosure: 0x500304801ef3ab7f BayID: 3 - Serial number:        2EGZVAPX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:3/end_device-11:0:3/sas_device/end_device-11:0:3
 
-/sys/block/sdh Enclosure: 0x500304801ef3ae7f BayID: 4 - Serial number:        ZA1C7VPZ0000C847B044 - Vendor:               SEAGATE Product:              ST8000NM0065
+/sys/block/sdh Enclosure: 0x500304801ef3ab7f BayID: 4 - Serial number:        2EJT1WPV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:4/end_device-11:0:4/sas_device/end_device-11:0:4
 
-/sys/block/sdi Enclosure: 0x500304801ef3ae7f BayID: 5 - Serial number:        ZA1D30QY0000C90503N0 - Vendor:               SEAGATE Product:              ST8000NM0065
+/sys/block/sdi Enclosure: 0x500304801ef3ab7f BayID: 5 - Serial number:        2EGY07NV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:5/end_device-11:0:5/sas_device/end_device-11:0:5
 
-/sys/block/sdj Enclosure: 0x500304801ef3ae7f BayID: 6 - Serial number:        ZA1D4M9V0000C905GMP0 - Vendor:               SEAGATE Product:              ST8000NM0065
+/sys/block/sdj Enclosure: 0x500304801ef3ab7f BayID: 6 - Serial number:        2EGYHR6V - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:6/end_device-11:0:6/sas_device/end_device-11:0:6
 
-/sys/block/sdk Enclosure: 0x500304801ef3ae7f BayID: 7 - Serial number:        2EH88JZV - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdk Enclosure: 0x500304801ef3ab7f BayID: 7 - Serial number:        2EH88GLV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:7/end_device-11:0:7/sas_device/end_device-11:0:7
 
-/sys/block/sdl Enclosure: 0x500304801ef3ae7f BayID: 8 - Serial number:        2EGHMWVV - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdl Enclosure: 0x500304801ef3ab7f BayID: 8 - Serial number:        2EH2TDTX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:8/end_device-11:0:8/sas_device/end_device-11:0:8
 
-/sys/block/sdm Enclosure: 0x500304801ef3ae7f BayID: 9 - Serial number:        2EH3A3RX - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdm Enclosure: 0x500304801ef3ab7f BayID: 9 - Serial number:        2EGHR4EV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:9/end_device-11:0:9/sas_device/end_device-11:0:9
 
-/sys/block/sdn Enclosure: 0x500304801ef3ae7f BayID: 10 - Serial number:        2EH8NR4V - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdn Enclosure: 0x500304801ef3ab7f BayID: 10 - Serial number:        2EGXX8RX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:10/end_device-11:0:10/sas_device/end_device-11:0:10
 
-/sys/block/sdo Enclosure: 0x500304801ef3ae7f BayID: 11 - Serial number:        2EH8756V - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdo Enclosure: 0x500304801ef3ab7f BayID: 11 - Serial number:        2EGYPWMX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:11/end_device-11:0:11/sas_device/end_device-11:0:11
 
-/sys/block/sdp Enclosure: 0x500304801ef3ae7f BayID: 12 - Serial number:        2EH8NR1V - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdp Enclosure: 0x500304801ef3ab7f BayID: 12 - Serial number:        2EH5WVEV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:12/end_device-11:0:12/sas_device/end_device-11:0:12
 
-/sys/block/sdq Enclosure: 0x500304801ef3ae7f BayID: 13 - Serial number:        2EH34WDX - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdq Enclosure: 0x500304801ef3ab7f BayID: 13 - Serial number:        2EH89NPV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:13/end_device-11:0:13/sas_device/end_device-11:0:13
 
-/sys/block/sdr Enclosure: 0x500304801ef3ae7f BayID: 14 - Serial number:        2EGRN8LV - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdr Enclosure: 0x500304801ef3ab7f BayID: 14 - Serial number:        2EGXB0UV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:14/end_device-11:0:14/sas_device/end_device-11:0:14
 
-/sys/block/sds Enclosure: 0x500304801ef3ae7f BayID: 15 - Serial number:        2EGXRJ8V - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sds Enclosure: 0x500304801ef3ab7f BayID: 15 - Serial number:        2EH8R5ZV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:15/end_device-11:0:15/sas_device/end_device-11:0:15
 
-/sys/block/sdt Enclosure: 0x500304801ef3ae7f BayID: 16 - Serial number:        2EGRPBUV - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdt Enclosure: 0x500304801ef3ab7f BayID: 16 - Serial number:        2EH66R9V - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:16/end_device-11:0:16/sas_device/end_device-11:0:16
 
-/sys/block/sdu Enclosure: 0x500304801ef3ae7f BayID: 17 - Serial number:        2EGY4SHV - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdu Enclosure: 0x500304801ef3ab7f BayID: 17 - Serial number:        2EGXD4TV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:17/end_device-11:0:17/sas_device/end_device-11:0:17
 
-/sys/block/sdv Enclosure: 0x500304801ef3ae7f BayID: 18 - Serial number:        2EH25W6X - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdv Enclosure: 0x500304801ef3ab7f BayID: 18 - Serial number:        2EH802TV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:18/end_device-11:0:18/sas_device/end_device-11:0:18
 
-/sys/block/sdw Enclosure: 0x500304801ef3ae7f BayID: 19 - Serial number:        2EH4EJHX - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdw Enclosure: 0x500304801ef3ab7f BayID: 19 - Serial number:        2EGUAYDX - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:19/end_device-11:0:19/sas_device/end_device-11:0:19
 
-/sys/block/sdx Enclosure: 0x500304801ef3ae7f BayID: 20 - Serial number:        2EGY353X - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdx Enclosure: 0x500304801ef3ab7f BayID: 20 - Serial number:        2EGYHHGV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:20/end_device-11:0:20/sas_device/end_device-11:0:20
 
-/sys/block/sdy Enclosure: 0x500304801ef3ae7f BayID: 21 - Serial number:        2EH38B6X - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdy Enclosure: 0x500304801ef3ab7f BayID: 21 - Serial number:        2EH86ZZV - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:21/end_device-11:0:21/sas_device/end_device-11:0:21
 
-/sys/block/sdz Enclosure: 0x500304801ef3ae7f BayID: 22 - Serial number:        2EGZ37EX - Vendor:               HGST Product:              HUH728080AL4200
+/sys/block/sdz Enclosure: 0x500304801ef3ab7f BayID: 22 - Serial number:        2EGSLU3X - Vendor:               HGST Product:              HUH728080AL4200
 /sys/devices/pci0000:80/0000:80:02.0/0000:82:00.0/host11/port-11:0/expander-11:0/port-11:0:22/end_device-11:0:22/sas_device/end_device-11:0:22
 
diff --git a/scripts/ceph-standalone-deploy/disks_lists.pp b/scripts/ceph-standalone-deploy/disks_lists.pp
index 7664196db76b0520da05f3175c7e679ec8a968a9..efe8c3c4bd5f8b257b7421da90fc2b8071099638 100644
--- a/scripts/ceph-standalone-deploy/disks_lists.pp
+++ b/scripts/ceph-standalone-deploy/disks_lists.pp
@@ -11,364 +11,182 @@ class storage_ceph::disks::disks_lists {
     'ceph_osd_list_prod_cs-001' => {
       '23-2EH3N2JX-HGST-HUH728080AL4200/sdaa_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdaa_wal/cs-001_journal',        
-         bluestore_db => 'sdaa_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdaa_wal',        
+         bluestore_db => 'cs-001_journal/sdaa_db',        
          ensure     => 'present',
       },
       '24-2EH3GSNX-HGST-HUH728080AL4200/sdab_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdab_wal/cs-001_journal',        
-         bluestore_db => 'sdab_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdab_wal',        
+         bluestore_db => 'cs-001_journal/sdab_db',        
          ensure     => 'present',
       },
       '25-2EGYZX1X-HGST-HUH728080AL4200/sdac_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdac_wal/cs-001_journal',        
-         bluestore_db => 'sdac_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdac_wal',        
+         bluestore_db => 'cs-001_journal/sdac_db',        
          ensure     => 'present',
       },
       '26-2EH87DSV-HGST-HUH728080AL4200/sdad_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdad_wal/cs-001_journal',        
-         bluestore_db => 'sdad_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdad_wal',        
+         bluestore_db => 'cs-001_journal/sdad_db',        
          ensure     => 'present',
       },
       '27-2EGP9Z4V-HGST-HUH728080AL4200/sdae_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdae_wal/cs-001_journal',        
-         bluestore_db => 'sdae_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdae_wal',        
+         bluestore_db => 'cs-001_journal/sdae_db',        
          ensure     => 'present',
       },
       '28-2EGKBRAV-HGST-HUH728080AL4200/sdaf_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdaf_wal/cs-001_journal',        
-         bluestore_db => 'sdaf_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdaf_wal',        
+         bluestore_db => 'cs-001_journal/sdaf_db',        
          ensure     => 'present',
       },
       '29-2EH5WTUV-HGST-HUH728080AL4200/sdag_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdag_wal/cs-001_journal',        
-         bluestore_db => 'sdag_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdag_wal',        
+         bluestore_db => 'cs-001_journal/sdag_db',        
          ensure     => 'present',
       },
       '0-2EH13V4X-HGST-HUH728080AL4200/sdd_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdd_wal/cs-001_journal',        
-         bluestore_db => 'sdd_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdd_wal',        
+         bluestore_db => 'cs-001_journal/sdd_db',        
          ensure     => 'present',
       },
       '1-2EGRN53V-HGST-HUH728080AL4200/sde_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sde_wal/cs-001_journal',        
-         bluestore_db => 'sde_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sde_wal',        
+         bluestore_db => 'cs-001_journal/sde_db',        
          ensure     => 'present',
       },
       '2-2EGSSBLX-HGST-HUH728080AL4200/sdf_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdf_wal/cs-001_journal',        
-         bluestore_db => 'sdf_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdf_wal',        
+         bluestore_db => 'cs-001_journal/sdf_db',        
          ensure     => 'present',
       },
       '3-2EGZVAPX-HGST-HUH728080AL4200/sdg_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdg_wal/cs-001_journal',        
-         bluestore_db => 'sdg_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdg_wal',        
+         bluestore_db => 'cs-001_journal/sdg_db',        
          ensure     => 'present',
       },
       '4-2EJT1WPV-HGST-HUH728080AL4200/sdh_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdh_wal/cs-001_journal',        
-         bluestore_db => 'sdh_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdh_wal',        
+         bluestore_db => 'cs-001_journal/sdh_db',        
          ensure     => 'present',
       },
       '5-2EGY07NV-HGST-HUH728080AL4200/sdi_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdi_wal/cs-001_journal',        
-         bluestore_db => 'sdi_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdi_wal',        
+         bluestore_db => 'cs-001_journal/sdi_db',        
          ensure     => 'present',
       },
       '6-2EGYHR6V-HGST-HUH728080AL4200/sdj_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdj_wal/cs-001_journal',        
-         bluestore_db => 'sdj_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdj_wal',        
+         bluestore_db => 'cs-001_journal/sdj_db',        
          ensure     => 'present',
       },
       '7-2EH88GLV-HGST-HUH728080AL4200/sdk_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdk_wal/cs-001_journal',        
-         bluestore_db => 'sdk_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdk_wal',        
+         bluestore_db => 'cs-001_journal/sdk_db',        
          ensure     => 'present',
       },
       '8-2EH2TDTX-HGST-HUH728080AL4200/sdl_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdl_wal/cs-001_journal',        
-         bluestore_db => 'sdl_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdl_wal',        
+         bluestore_db => 'cs-001_journal/sdl_db',        
          ensure     => 'present',
       },
       '9-2EGHR4EV-HGST-HUH728080AL4200/sdm_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdm_wal/cs-001_journal',        
-         bluestore_db => 'sdm_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdm_wal',        
+         bluestore_db => 'cs-001_journal/sdm_db',        
          ensure     => 'present',
       },
       '10-2EGXX8RX-HGST-HUH728080AL4200/sdn_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdn_wal/cs-001_journal',        
-         bluestore_db => 'sdn_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdn_wal',        
+         bluestore_db => 'cs-001_journal/sdn_db',        
          ensure     => 'present',
       },
       '11-2EGYPWMX-HGST-HUH728080AL4200/sdo_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdo_wal/cs-001_journal',        
-         bluestore_db => 'sdo_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdo_wal',        
+         bluestore_db => 'cs-001_journal/sdo_db',        
          ensure     => 'present',
       },
       '12-2EH5WVEV-HGST-HUH728080AL4200/sdp_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdp_wal/cs-001_journal',        
-         bluestore_db => 'sdp_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdp_wal',        
+         bluestore_db => 'cs-001_journal/sdp_db',        
          ensure     => 'present',
       },
       '13-2EH89NPV-HGST-HUH728080AL4200/sdq_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdq_wal/cs-001_journal',        
-         bluestore_db => 'sdq_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdq_wal',        
+         bluestore_db => 'cs-001_journal/sdq_db',        
          ensure     => 'present',
       },
       '14-2EGXB0UV-HGST-HUH728080AL4200/sdr_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdr_wal/cs-001_journal',        
-         bluestore_db => 'sdr_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdr_wal',        
+         bluestore_db => 'cs-001_journal/sdr_db',        
          ensure     => 'present',
       },
       '15-2EH8R5ZV-HGST-HUH728080AL4200/sds_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sds_wal/cs-001_journal',        
-         bluestore_db => 'sds_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sds_wal',        
+         bluestore_db => 'cs-001_journal/sds_db',        
          ensure     => 'present',
       },
       '16-2EH66R9V-HGST-HUH728080AL4200/sdt_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdt_wal/cs-001_journal',        
-         bluestore_db => 'sdt_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdt_wal',        
+         bluestore_db => 'cs-001_journal/sdt_db',        
          ensure     => 'present',
       },
       '17-2EGXD4TV-HGST-HUH728080AL4200/sdu_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdu_wal/cs-001_journal',        
-         bluestore_db => 'sdu_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdu_wal',        
+         bluestore_db => 'cs-001_journal/sdu_db',        
          ensure     => 'present',
       },
       '18-2EH802TV-HGST-HUH728080AL4200/sdv_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdv_wal/cs-001_journal',        
-         bluestore_db => 'sdv_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdv_wal',        
+         bluestore_db => 'cs-001_journal/sdv_db',        
          ensure     => 'present',
       },
       '19-2EGUAYDX-HGST-HUH728080AL4200/sdw_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdw_wal/cs-001_journal',        
-         bluestore_db => 'sdw_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdw_wal',        
+         bluestore_db => 'cs-001_journal/sdw_db',        
          ensure     => 'present',
       },
       '20-2EGYHHGV-HGST-HUH728080AL4200/sdx_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdx_wal/cs-001_journal',        
-         bluestore_db => 'sdx_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdx_wal',        
+         bluestore_db => 'cs-001_journal/sdx_db',        
          ensure     => 'present',
       },
       '21-2EH86ZZV-HGST-HUH728080AL4200/sdy_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdy_wal/cs-001_journal',        
-         bluestore_db => 'sdy_db/cs-001_journal',        
+         bluestore_wal => 'cs-001_journal/sdy_wal',        
+         bluestore_db => 'cs-001_journal/sdy_db',        
          ensure     => 'present',
       },
       '22-2EGSLU3X-HGST-HUH728080AL4200/sdz_data'=>         {
          store_type => 'bluestore',        
-         bluestore_wal => 'sdz_wal/cs-001_journal',        
-         bluestore_db => 'sdz_db/cs-001_journal',        
-         ensure     => 'present',
-      },
-    },
-    'ceph_osd_list_prod_cs-002' => {
-      '23-2EGYV57X-HGST-HUH728080AL4200/sdaa_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdaa_wal/cs-002_journal',        
-         bluestore_db => 'sdaa_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '24-2EGHJGNX-HGST-HUH728080AL4200/sdab_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdab_wal/cs-002_journal',        
-         bluestore_db => 'sdab_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '25-2EH15P4X-HGST-HUH728080AL4200/sdac_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdac_wal/cs-002_journal',        
-         bluestore_db => 'sdac_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '26-2EGZ3K1X-HGST-HUH728080AL4200/sdad_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdad_wal/cs-002_journal',        
-         bluestore_db => 'sdad_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '27-2EH0MTYX-HGST-HUH728080AL4200/sdae_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdae_wal/cs-002_journal',        
-         bluestore_db => 'sdae_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '28-2EH2559X-HGST-HUH728080AL4200/sdaf_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdaf_wal/cs-002_journal',        
-         bluestore_db => 'sdaf_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '29-2EGVKABX-HGST-HUH728080AL4200/sdag_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdag_wal/cs-002_journal',        
-         bluestore_db => 'sdag_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '0-ZA1D4Q180000C9054BTH-SEAGATE-ST8000NM0065/sdd_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdd_wal/cs-002_journal',        
-         bluestore_db => 'sdd_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '1-ZA1D4PNR0000C9057BAH-SEAGATE-ST8000NM0065/sde_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sde_wal/cs-002_journal',        
-         bluestore_db => 'sde_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '2-ZA1D30NN0000C90503WV-SEAGATE-ST8000NM0065/sdf_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdf_wal/cs-002_journal',        
-         bluestore_db => 'sdf_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '3-ZA1D30XX0000C90502KD-SEAGATE-ST8000NM0065/sdg_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdg_wal/cs-002_journal',        
-         bluestore_db => 'sdg_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '4-ZA1C7VPZ0000C847B044-SEAGATE-ST8000NM0065/sdh_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdh_wal/cs-002_journal',        
-         bluestore_db => 'sdh_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '5-ZA1D30QY0000C90503N0-SEAGATE-ST8000NM0065/sdi_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdi_wal/cs-002_journal',        
-         bluestore_db => 'sdi_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '6-ZA1D4M9V0000C905GMP0-SEAGATE-ST8000NM0065/sdj_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdj_wal/cs-002_journal',        
-         bluestore_db => 'sdj_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '7-2EH88JZV-HGST-HUH728080AL4200/sdk_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdk_wal/cs-002_journal',        
-         bluestore_db => 'sdk_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '8-2EGHMWVV-HGST-HUH728080AL4200/sdl_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdl_wal/cs-002_journal',        
-         bluestore_db => 'sdl_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '9-2EH3A3RX-HGST-HUH728080AL4200/sdm_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdm_wal/cs-002_journal',        
-         bluestore_db => 'sdm_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '10-2EH8NR4V-HGST-HUH728080AL4200/sdn_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdn_wal/cs-002_journal',        
-         bluestore_db => 'sdn_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '11-2EH8756V-HGST-HUH728080AL4200/sdo_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdo_wal/cs-002_journal',        
-         bluestore_db => 'sdo_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '12-2EH8NR1V-HGST-HUH728080AL4200/sdp_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdp_wal/cs-002_journal',        
-         bluestore_db => 'sdp_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '13-2EH34WDX-HGST-HUH728080AL4200/sdq_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdq_wal/cs-002_journal',        
-         bluestore_db => 'sdq_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '14-2EGRN8LV-HGST-HUH728080AL4200/sdr_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdr_wal/cs-002_journal',        
-         bluestore_db => 'sdr_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '15-2EGXRJ8V-HGST-HUH728080AL4200/sds_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sds_wal/cs-002_journal',        
-         bluestore_db => 'sds_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '16-2EGRPBUV-HGST-HUH728080AL4200/sdt_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdt_wal/cs-002_journal',        
-         bluestore_db => 'sdt_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '17-2EGY4SHV-HGST-HUH728080AL4200/sdu_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdu_wal/cs-002_journal',        
-         bluestore_db => 'sdu_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '18-2EH25W6X-HGST-HUH728080AL4200/sdv_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdv_wal/cs-002_journal',        
-         bluestore_db => 'sdv_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '19-2EH4EJHX-HGST-HUH728080AL4200/sdw_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdw_wal/cs-002_journal',        
-         bluestore_db => 'sdw_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '20-2EGY353X-HGST-HUH728080AL4200/sdx_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdx_wal/cs-002_journal',        
-         bluestore_db => 'sdx_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '21-2EH38B6X-HGST-HUH728080AL4200/sdy_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdy_wal/cs-002_journal',        
-         bluestore_db => 'sdy_db/cs-002_journal',        
-         ensure     => 'present',
-      },
-      '22-2EGZ37EX-HGST-HUH728080AL4200/sdz_data'=>         {
-         store_type => 'bluestore',        
-         bluestore_wal => 'sdz_wal/cs-002_journal',        
-         bluestore_db => 'sdz_db/cs-002_journal',        
+         bluestore_wal => 'cs-001_journal/sdz_wal',        
+         bluestore_db => 'cs-001_journal/sdz_db',        
          ensure     => 'present',
       },
     },