Skip to content

Commit aa51638

Browse files
committed
define osd as instance variable
1 parent be3bd2b commit aa51638

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ceph_devstack/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +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
21+
osd_count = 1
2222

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

ceph_devstack/resources/ceph/containers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Postgres(Container):
2121
"--network",
2222
"ceph-devstack",
2323
"-p",
24-
"5432:5432",
24+
"5431:5432",
2525
"--health-cmd",
2626
"CMD pg_isready -q -d paddles -U admin",
2727
"--health-interval",
@@ -174,7 +174,6 @@ class TestNode(Container):
174174
"SSH_PUBKEY": "",
175175
"CEPH_VOLUME_ALLOW_LOOP_DEVICES": "true",
176176
}
177-
osd_count = config["containers"]["testnode"]["osd_count"]
178177

179178
def __init__(self, name: str = ""):
180179
super().__init__(name=name)
@@ -185,6 +184,7 @@ def __init__(self, name: str = ""):
185184
else:
186185
self.loop_img_name += str(self.loop_index)
187186
self.loop_dev_name = f"/dev/loop{self.loop_index}"
187+
self.osd_count = config["containers"]["testnode"]["osd_count"]
188188

189189
@property
190190
def loop_img_dir(self):

0 commit comments

Comments
 (0)