Skip to content

Commit 7c23a0a

Browse files
committed
wip: implement device name function
1 parent aa51638 commit 7c23a0a

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ceph_devstack/resources/ceph/containers.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,13 @@ async def create_loop_devices(self):
252252
for i in range(self.osd_count):
253253
await self.create_loop_device(i)
254254

255+
def device_name(self, index: int):
256+
if self.loop_index == 0:
257+
return f"/dev/loop{index}"
258+
return f"{self.loop_dev_name}{index}"
259+
255260
def loop_devices_mapping(self):
256-
return [f"--device={self.loop_dev_name}.{i}" for i in range(self.osd_count)]
261+
return [f"--device={self.device_name(i)}" for i in range(self.osd_count)]
257262

258263
async def create_loop_device(self, index: int):
259264
size_gb = 5
@@ -262,7 +267,7 @@ async def create_loop_device(self, index: int):
262267
if proc and await proc.wait() != 0:
263268
await self.cmd(["sudo", "modprobe", "loop"])
264269
loop_img_name = os.path.join(self.loop_img_dir, f"{self.loop_img_name}.{index}")
265-
loop_dev_name = f"{self.loop_dev_name}.{index}"
270+
loop_dev_name = self.device_name(index)
266271
await self.remove_loop_device(index)
267272
await self.cmd(
268273
[
@@ -300,7 +305,7 @@ async def remove_loop_devices(self):
300305

301306
async def remove_loop_device(self, index: int):
302307
loop_img_name = os.path.join(self.loop_img_dir, f"{self.loop_img_name}.{index}")
303-
loop_dev_name = f"{self.loop_dev_name}.{index}"
308+
loop_dev_name = self.device_name(index)
304309
if os.path.ismount(loop_dev_name):
305310
await self.cmd(["umount", loop_dev_name], check=True)
306311
if host.path_exists(loop_dev_name):

0 commit comments

Comments
 (0)