Skip to content

Commit be3bd2b

Browse files
committed
define osd count as config var
1 parent 4cb6934 commit be3bd2b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

ceph_devstack/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ image = "quay.io/ceph-infra/pulpito:latest"
1818
[containers.testnode]
1919
count = 3
2020
image = "quay.io/ceph-infra/teuthology-testnode:latest"
21+
osd_count = 3
2122

2223
[containers.teuthology]
2324
image = "quay.io/ceph-infra/teuthology-dev:latest"

ceph_devstack/resources/ceph/containers.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ class TestNode(Container):
174174
"SSH_PUBKEY": "",
175175
"CEPH_VOLUME_ALLOW_LOOP_DEVICES": "true",
176176
}
177+
osd_count = config["containers"]["testnode"]["osd_count"]
177178

178179
def __init__(self, name: str = ""):
179180
super().__init__(name=name)
@@ -248,11 +249,11 @@ async def remove(self):
248249
await self.remove_loop_devices()
249250

250251
async def create_loop_devices(self):
251-
for i in range(2):
252+
for i in range(self.osd_count):
252253
await self.create_loop_device(i)
253254

254255
def loop_devices_mapping(self):
255-
return [f"--device={self.loop_dev_name}.{i}" for i in range(2)]
256+
return [f"--device={self.loop_dev_name}.{i}" for i in range(self.osd_count)]
256257

257258
async def create_loop_device(self, index: int):
258259
size_gb = 5
@@ -294,7 +295,7 @@ async def create_loop_device(self, index: int):
294295
await self.cmd(["sudo", "losetup", loop_dev_name, loop_img_name], check=True)
295296

296297
async def remove_loop_devices(self):
297-
for i in range(2):
298+
for i in range(self.osd_count):
298299
await self.remove_loop_device(i)
299300

300301
async def remove_loop_device(self, index: int):

0 commit comments

Comments
 (0)