From: Proskurin Kirill <kproskurin@mirantis.com>
Date: Wed, 28 Sep 2016 10:04:44 +0000 (+0300)
Subject: Remove duplication of "osd crush chooseleaf type"
X-Git-Tag: v1.0.7~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1000%2Fhead;p=ceph-ansible.git

Remove duplication of "osd crush chooseleaf type"

Signed-off-by: Proskurin Kirill <kproskurin@mirantis.com>
---

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 61bd2cf42..a068392dc 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -56,9 +56,6 @@ public_network = {{ public_network }}
 {% if cluster_network is defined %}
 cluster_network = {{ cluster_network }}
 {% endif %}
-{% if common_single_host_mode is defined %}
-osd crush chooseleaf type = 0
-{% endif %}
 
 [client.libvirt]
 admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor