Merge "Change `osd crush location` to `crush location`"

templates/ceph.conf

@@ -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