From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 20 Jul 2017 16:41:54 +0000 (+0200)
Subject: Revert "Use optimal (instead of default) tunables for Ceph on upgrade"
X-Git-Tag: opnfv-6.0.0~368^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c243560d20704ba53a17675f16915f5a896f32ab;p=apex-tripleo-heat-templates.git

Revert "Use optimal (instead of default) tunables for Ceph on upgrade"

This reverts commit 5e9f855f7c96950ca29a0f85086441c57ae7aed5.

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: I429e9f7f220a844b5ca61734287e514c96ea5e6c
---

diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 3e4f5b42..4fe6e908 100644
--- a/puppet/services/ceph-mon.yaml
+++ b/puppet/services/ceph-mon.yaml
@@ -172,6 +172,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