From 6f65523a62c75e3f70a1606f1b22da321b83c261 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Wed, 21 Mar 2018 22:16:03 +0000
Subject: [PATCH] gate: fix ceph on centos

Change-Id: Id006bc4c81cfb4b3d72168f1da4ff1220c758e34
---
 tools/deployment/multinode/030-ceph.sh    | 3 +++
 tools/deployment/multinode/050-mariadb.sh | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index 417cda55e2..7c0c3633c3 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -30,6 +30,9 @@ if [ "x${ID}" == "xubuntu" ] && \
 else
   CRUSH_TUNABLES=null
 fi
+if [ "x${ID}" == "xcentos" ]; then
+  CRUSH_TUNABLES=hammer
+fi
 tee /tmp/ceph.yaml << EOF
 endpoints:
   identity:
diff --git a/tools/deployment/multinode/050-mariadb.sh b/tools/deployment/multinode/050-mariadb.sh
index ffa966590f..9bff0d5429 100755
--- a/tools/deployment/multinode/050-mariadb.sh
+++ b/tools/deployment/multinode/050-mariadb.sh
@@ -21,7 +21,6 @@ helm upgrade --install mariadb ./mariadb \
     --namespace=openstack \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_MARIADB}
-
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack