From bfe7a99a61e49ccd9ef9d73f181862646f92e6b8 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy Mallavarapu <cr3938@att.com>
Date: Wed, 1 Jul 2020 12:52:46 -0500
Subject: [PATCH] [CEPH] Make ceph-volume as default deployment tool

This is to make ceph-volume as default deployment tool
since support for ceph-disk got deprectated from Nautilus version of
ceph.

Change-Id: I10f42fd0cb43a951f480594d269fd998de5678bf
---
 ceph-osd/values.yaml                           | 2 +-
 tools/deployment/multinode/030-ceph.sh         | 2 --
 tools/deployment/osh-infra-logging/020-ceph.sh | 2 --
 tools/deployment/tenant-ceph/030-ceph.sh       | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index 38307dd46..6a4b2d308 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -46,7 +46,7 @@ labels:
 # Keeping ceph-disk as default since gate scripts are still directory backed
 # osds, need to change this after moving the gates to disk backed osd.
 deploy:
-  tool: "ceph-disk"
+  tool: "ceph-volume"
 
 pod:
   security_context:
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index d844e4551..5f61d0963 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -98,8 +98,6 @@ manifests:
   cronjob_defragosds: true
   deployment_cephfs_provisioner: false
   job_cephfs_client_key: false
-deploy:
-  tool: "ceph-volume"
 EOF
 
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
diff --git a/tools/deployment/osh-infra-logging/020-ceph.sh b/tools/deployment/osh-infra-logging/020-ceph.sh
index 94dea7273..a2f3a6a23 100755
--- a/tools/deployment/osh-infra-logging/020-ceph.sh
+++ b/tools/deployment/osh-infra-logging/020-ceph.sh
@@ -173,8 +173,6 @@ pod:
     mds: 1
     mgr: 1
     rgw: 1
-deploy:
-  tool: "ceph-volume"
 jobs:
   ceph_defragosds:
     # Execute every 15 minutes for gates
diff --git a/tools/deployment/tenant-ceph/030-ceph.sh b/tools/deployment/tenant-ceph/030-ceph.sh
index af49111c1..b74b09d21 100755
--- a/tools/deployment/tenant-ceph/030-ceph.sh
+++ b/tools/deployment/tenant-ceph/030-ceph.sh
@@ -114,8 +114,6 @@ monitoring:
     enabled: true
     ceph_mgr:
       port: 9283
-deploy:
-  tool: "ceph-volume"
 EOF
 
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do