Merge bootstack-ops:ceph-replication-sf00133010-mma1 into bootstack-ops:master

Proposed by Peter Sabaini
Status: Merged
Approved by: Peter Sabaini
Approved revision: f034ce3abb5d0e5c97bf8f17291eb4b7161d6805
Merged at revision: 2737aa14c20e48ae53da3dcc4511b10d46745cfa
Proposed branch: bootstack-ops:ceph-replication-sf00133010-mma1
Merge into: bootstack-ops:master
Diff against target: 113 lines (+73/-0)
8 files modified
bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/01-rack-init.sh (+18/-0)
bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/02-osd-move.sh (+45/-0)
bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/03-crushmap-prep.sh (+6/-0)
bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/04-crushmap-set.sh (+4/-0)
bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/01-rack-init.sh (+0/-0)
bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/02-osd-move.sh (+0/-0)
bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/03-crushmap-prep.sh (+0/-0)
bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/04-crushmap-set.sh (+0/-0)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Review via email: mp+338444@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alvaro Uria (aluria) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/01-rack-init.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/01-rack-init.sh
2new file mode 100755
3index 0000000..9cf797c
4--- /dev/null
5+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/01-rack-init.sh
6@@ -0,0 +1,18 @@
7+#!/bin/bash
8+set -eux
9+
10+ceph osd crush add-bucket z1305 rack
11+ceph osd crush add-bucket z1306 rack
12+ceph osd crush add-bucket z1307 rack
13+ceph osd crush add-bucket z1308 rack
14+ceph osd crush add-bucket z1609 rack
15+ceph osd crush add-bucket z1610 rack
16+
17+ceph osd crush move z1305 root=default
18+ceph osd crush move z1306 root=default
19+ceph osd crush move z1307 root=default
20+ceph osd crush move z1308 root=default
21+ceph osd crush move z1609 root=default
22+ceph osd crush move z1610 root=default
23+
24+
25diff --git a/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/02-osd-move.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/02-osd-move.sh
26new file mode 100755
27index 0000000..99166a0
28--- /dev/null
29+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/02-osd-move.sh
30@@ -0,0 +1,45 @@
31+#!/bin/bash
32+set -eux
33+
34+ceph osd crush move LIM96-1307-Compute-1 rack=z1307
35+ceph osd crush move LIM96-1308-Compute-2 rack=z1308
36+ceph osd crush move LIM96-1307-Compute-3 rack=z1307
37+ceph osd crush move LIM96-1308-Compute-3 rack=z1308
38+ceph osd crush move LIM96-1308-Compute-7 rack=z1308
39+ceph osd crush move LIM96-1308-Compute-1 rack=z1308
40+ceph osd crush move LIM96-1307-Compute-4 rack=z1307
41+ceph osd crush move LIM96-1308-Compute-5 rack=z1308
42+ceph osd crush move LIM96-1307-Compute-5 rack=z1307
43+ceph osd crush move LIM96-1308-Compute-6 rack=z1308
44+ceph osd crush move LIM96-1307-Compute-6 rack=z1307
45+ceph osd crush move LIM96-1307-Compute-7 rack=z1307
46+ceph osd crush move LIM96-1306-Compute-1 rack=z1306
47+ceph osd crush move LIM96-1306-Compute-2 rack=z1306
48+ceph osd crush move LIM96-1308-Compute-4 rack=z1308
49+ceph osd crush move LIM96-1306-Compute-3 rack=z1306
50+ceph osd crush move LIM96-1306-Compute-4 rack=z1306
51+ceph osd crush move LIM96-1306-Compute-5 rack=z1306
52+ceph osd crush move LIM96-1306-Compute-6 rack=z1306
53+ceph osd crush move LIM96-1306-Compute-7 rack=z1306
54+ceph osd crush move LIM96-1305-Compute-1 rack=z1305
55+ceph osd crush move LIM96-1305-Compute-2 rack=z1305
56+ceph osd crush move LIM96-1305-Compute-3 rack=z1305
57+ceph osd crush move LIM96-1305-Compute-4 rack=z1305
58+ceph osd crush move LIM96-1305-Compute-5 rack=z1305
59+ceph osd crush move LIM96-1305-Compute-6 rack=z1305
60+ceph osd crush move LIM96-1305-Compute-7 rack=z1305
61+ceph osd crush move LIM96-1610-Compute-1 rack=z1610
62+ceph osd crush move LIM96-1610-Compute-2 rack=z1610
63+ceph osd crush move LIM96-1610-Compute-3 rack=z1610
64+ceph osd crush move LIM96-1609-Compute-5 rack=z1609
65+ceph osd crush move LIM96-1610-Compute-5 rack=z1610
66+ceph osd crush move LIM96-1610-Compute-6 rack=z1610
67+ceph osd crush move LIM96-1609-Compute-6 rack=z1609
68+ceph osd crush move LIM96-1609-Compute-3 rack=z1609
69+ceph osd crush move LIM96-1609-Compute-4 rack=z1609
70+ceph osd crush move LIM96-1609-Compute-1 rack=z1609
71+ceph osd crush move LIM96-1609-Compute-7 rack=z1609
72+ceph osd crush move LIM96-1610-Compute-7 rack=z1610
73+ceph osd crush move LIM96-1307-Compute-2 rack=z1307
74+ceph osd crush move LIM96-1610-Compute-4 rack=z1610
75+ceph osd crush move LIM96-1609-Compute-2 rack=z1609
76diff --git a/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/03-crushmap-prep.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/03-crushmap-prep.sh
77new file mode 100755
78index 0000000..5deda8f
79--- /dev/null
80+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/03-crushmap-prep.sh
81@@ -0,0 +1,6 @@
82+#!/bin/bash
83+set -eux
84+ceph osd getcrushmap -o crush.map
85+crushtool -d crush.map | sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type rack/' > crush.decompiled
86+crushtool -c crush.decompiled -o crush.map
87+crushtool -i crush.map --test
88diff --git a/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/04-crushmap-set.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/04-crushmap-set.sh
89new file mode 100755
90index 0000000..1b704a2
91--- /dev/null
92+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-mma1/04-crushmap-set.sh
93@@ -0,0 +1,4 @@
94+#!/bin/bash
95+set -eux
96+
97+ceph osd setcrushmap -i crush.map
98diff --git a/bootstack-ops/ceph-replication-sf00133010-sto1/01-rack-init.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/01-rack-init.sh
99index 30d32c0..30d32c0 100755
100--- a/bootstack-ops/ceph-replication-sf00133010-sto1/01-rack-init.sh
101+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/01-rack-init.sh
102diff --git a/bootstack-ops/ceph-replication-sf00133010-sto1/02-osd-move.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/02-osd-move.sh
103index e401123..e401123 100755
104--- a/bootstack-ops/ceph-replication-sf00133010-sto1/02-osd-move.sh
105+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/02-osd-move.sh
106diff --git a/bootstack-ops/ceph-replication-sf00133010-sto1/03-crushmap-prep.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/03-crushmap-prep.sh
107index 2474ca1..2474ca1 100755
108--- a/bootstack-ops/ceph-replication-sf00133010-sto1/03-crushmap-prep.sh
109+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/03-crushmap-prep.sh
110diff --git a/bootstack-ops/ceph-replication-sf00133010-sto1/04-crushmap-set.sh b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/04-crushmap-set.sh
111index ae39b12..ae39b12 100755
112--- a/bootstack-ops/ceph-replication-sf00133010-sto1/04-crushmap-set.sh
113+++ b/bootstack-ops/ceph-replication/ceph-replication-sf00133010-sto1/04-crushmap-set.sh

Subscribers

People subscribed via source and target branches

to all changes: