From 9af78506469265d73c032837fa30be62d2e6b1c7 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 20 Jul 2017 18:44:44 +0200
Subject: [PATCH] Revert "Use optimal (instead of default) tunables for Ceph on
 upgrade"

This reverts commit 40de798ee69b4672172dcc766269e10c75f22a38.

The above would have fixed the issue but is only possible if the OSDs are
upgraded first. We probably need to disable flag warnings
completely instead. [1]

1. http://docs.ceph.com/docs/master/rados/operations/crush-map/#warning-when-tunables-are-non-optimal

Change-Id: I4af3a9cdf8efa411c5548baac6986c49824007e1
---
 puppet/services/ceph-mon.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 4143ad079e..d589ef89d8 100644
--- a/puppet/services/ceph-mon.yaml
+++ b/puppet/services/ceph-mon.yaml
@@ -153,6 +153,6 @@ outputs:
           until: ceph_quorum_nodecheck.rc == 0
           retries: {get_param: CephValidationRetries}
           delay: {get_param: CephValidationDelay}
-        - name: set crush tunables
+        - name: ceph osd crush tunables default
           tags: step0
-          shell: ceph osd crush tunables optimal
+          shell: ceph osd crush tunables default