Skip to content

Commit 690b380

Browse files
committed
fix(store): list all monitors in [global] section of config
This is due to a Ceph bug - http://tracker.ceph.com/issues/10012. Some configuration options aren't read properly if they're not in the `[global]` section of the Ceph config. This means that the store-gateway component was only connecting to the initial monitor, instead of using all the enumerated monitors. This notation is functionally equivalent, so it'll work just fine for us.
1 parent d146965 commit 690b380

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

store/base/templates/ceph.conf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[global]
22
fsid = {{ .deis_store_fsid }}
33
mon initial members = {{ .deis_store_monSetupLock }}
4+
mon host = {{ range $index, $mon := .deis_store_hosts }}{{ if $index }}, {{ end }}{{ Base $mon.Key }}{{ end }}
5+
mon addr = {{ range $index, $mon := .deis_store_hosts }}{{ if $index }}, {{ end }}{{ Base $mon.Key }}:6789{{ end }}
46
auth cluster required = cephx
57
auth service required = cephx
68
auth client required = cephx
@@ -11,12 +13,6 @@ osd pool default pgp_num = {{ .deis_store_pgNum }}
1113
osd recovery delay start = {{ .deis_store_delayStart }}
1214
log file = /dev/stdout
1315

14-
{{ range $mon := .deis_store_hosts }}
15-
[mon.{{ $mon.Value }}]
16-
host = {{ $mon.Value }}
17-
mon addr = {{ Base $mon.Key }}:6789
18-
{{ end }}
19-
2016
[client.radosgw.gateway]
2117
host = deis-store-gateway
2218
keyring = /etc/ceph/ceph.client.radosgw.keyring

0 commit comments

Comments
 (0)