diff options
| author | Sage Weil <sage@redhat.com> | 2019-03-20 10:29:23 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-03-21 18:03:13 +0100 |
| commit | 39f4e77d13377763a579f2afcd9341c00ca5b319 (patch) | |
| tree | 2f50d5362760acbac77c34445aad1e21b71d5494 /src/test/crush | |
| parent | Merge pull request #27045 from smithfarm/wip-38810 (diff) | |
| download | ceph-39f4e77d13377763a579f2afcd9341c00ca5b319.tar.xz ceph-39f4e77d13377763a579f2afcd9341c00ca5b319.zip | |
osd/OSDMap: add 'zone' to default crush map
This lets use have a root -> region -> zone -> host hierarchy, like you
will see in the public cloud.
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/test/crush')
| -rw-r--r-- | src/test/crush/crush-choose-args-expected-one-more-0.txt | 5 | ||||
| -rw-r--r-- | src/test/crush/crush-choose-args-expected-one-more-3.txt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/test/crush/crush-choose-args-expected-one-more-0.txt b/src/test/crush/crush-choose-args-expected-one-more-0.txt index 23068e68c86..bad7f0becfe 100644 --- a/src/test/crush/crush-choose-args-expected-one-more-0.txt +++ b/src/test/crush/crush-choose-args-expected-one-more-0.txt @@ -22,8 +22,9 @@ type 5 pdu type 6 pod type 7 room type 8 datacenter -type 9 region -type 10 root +type 9 zone +type 10 region +type 11 root # buckets host HOST { diff --git a/src/test/crush/crush-choose-args-expected-one-more-3.txt b/src/test/crush/crush-choose-args-expected-one-more-3.txt index 53cc3d11900..14cdd9c26d9 100644 --- a/src/test/crush/crush-choose-args-expected-one-more-3.txt +++ b/src/test/crush/crush-choose-args-expected-one-more-3.txt @@ -22,8 +22,9 @@ type 5 pdu type 6 pod type 7 room type 8 datacenter -type 9 region -type 10 root +type 9 zone +type 10 region +type 11 root # buckets host HOST { |