Change `osd crush location` to `crush location`

Upstream Ceph removed the `osd crush location` option in
commit f9db479a14d9103a2b7c0a24d958fe5fff94100e [0]. This
causes new clusters deployed from the Pike UCA (Luminous)
using the customize-failure-domain option to not create or
move the OSD to the correct spot in the OSD tree. The end
result is that placement groups will fail to peer because
there are no racks to select hosts and OSDs from.

Instead, the charm should set the more generic `crush
location` option in the ceph.conf file. It is and has been
supported since the Firefly (trusty-icehouse) version of
Ceph.

[0] f9db479a14

Change-Id: I0b7055b20f54096a2f33583079326aee17726355
Closes-Bug: 1730839
This commit is contained in:
Billy Olsen 2017-11-07 19:52:54 -07:00
parent d18c17186b
commit efcd88640f
1 changed files with 1 additions and 1 deletions

View File

@ -28,7 +28,7 @@ public addr = {{ public_addr }}
cluster addr = {{ cluster_addr }}
{%- endif %}
{%- if crush_location %}
osd crush location = {{crush_location}}
crush location = {{crush_location}}
{%- endif %}
{%- if upgrade_in_progress %}
setuser match path = /var/lib/ceph/$type/$cluster-$id