ceph-waw1 -> ceph-waw2
Change-Id: I03d6244b9697a9efc06492114ef90cdb01e17601
diff --git a/cluster/kube/cluster.jsonnet b/cluster/kube/cluster.jsonnet
index d0b77bd..0156672 100644
--- a/cluster/kube/cluster.jsonnet
+++ b/cluster/kube/cluster.jsonnet
@@ -93,7 +93,7 @@
spec+: {
// TODO(q3k): Bring up the operator again when stability gets fixed
// See: https://github.com/rook/rook/issues/3059#issuecomment-492378873
- replicas: 0,
+ replicas: 1,
},
},
},
@@ -102,7 +102,8 @@
registry: registry.Environment {
cfg+: {
domain: "registry.%s" % [fqdn],
- storageClassName: cfg.storageClassNameRedundant,
+ storageClassName: cfg.storageClassNameParanoid,
+ objectStorageName: "waw-hdd-redundant-2-object",
},
},
};
@@ -113,24 +114,25 @@
local k0 = self,
cluster: Cluster("k0.hswaw.net") {
cfg+: {
- storageClassNameRedundant: k0.ceph.blockRedundant.name,
+ storageClassNameParanoid: k0.ceph.blockParanoid.name,
},
},
cockroach: {
- waw1: cockroachdb.Cluster("crdb-waw1") {
+ waw2: cockroachdb.Cluster("crdb-waw2") {
cfg+: {
topology: [
{ name: "bc01n01", node: "bc01n01.hswaw.net" },
{ name: "bc01n02", node: "bc01n02.hswaw.net" },
{ name: "bc01n03", node: "bc01n03.hswaw.net" },
],
- hostPath: "/var/db/crdb-waw1",
+ hostPath: "/var/db/crdb-waw2",
},
},
},
ceph: {
- // waw1 cluster
- waw1: rook.Cluster(k0.cluster.rook, "ceph-waw1") {
+ // waw1 cluster - dead as of 2019/08/06, data corruption
+ // waw2 cluster
+ waw2: rook.Cluster(k0.cluster.rook, "ceph-waw2") {
spec: {
mon: {
count: 3,
@@ -164,7 +166,7 @@
},
},
// redundant block storage
- blockRedundant: rook.ECBlockPool(k0.ceph.waw1, "waw-hdd-redundant-1") {
+ blockRedundant: rook.ECBlockPool(k0.ceph.waw2, "waw-hdd-redundant-2") {
spec: {
failureDomain: "host",
erasureCoded: {
@@ -173,8 +175,17 @@
},
},
},
+ // paranoid block storage (3 replicas)
+ blockParanoid: rook.ReplicatedBlockPool(k0.ceph.waw2, "waw-hdd-paranoid-2") {
+ spec: {
+ failureDomain: "host",
+ replicated: {
+ size: 3,
+ },
+ },
+ },
// yolo block storage (no replicas!)
- blockYolo: rook.ReplicatedBlockPool(k0.ceph.waw1, "waw-hdd-yolo-1") {
+ blockYolo: rook.ReplicatedBlockPool(k0.ceph.waw2, "waw-hdd-yolo-2") {
spec: {
failureDomain: "host",
replicated: {
@@ -182,7 +193,7 @@
},
},
},
- objectRedundant: rook.S3ObjectStore(k0.ceph.waw1, "waw-hdd-redundant-1-object") {
+ objectRedundant: rook.S3ObjectStore(k0.ceph.waw2, "waw-hdd-redundant-2-object") {
spec: {
metadataPool: {
failureDomain: "host",