Remove Calamari-related functionality

Signed-off-by: John Spray <john.spray@redhat.com>
ceph · Sep 20, 2018 · 0ceeb1c · 0ceeb1c
1 parent b15f4e4
commit 0ceeb1c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 176 deletions.
diff --git a/ceph_deploy/calamari.py b/ceph_deploy/calamari.py
diff --git a/ceph_deploy/tests/parser/test_calamari.py b/ceph_deploy/tests/parser/test_calamari.py
diff --git a/ceph_deploy/tests/parser/test_main.py b/ceph_deploy/tests/parser/test_main.py
@@ -7,7 +7,7 @@
 
 SUBCMDS_WITH_ARGS = [
     'new', 'install', 'rgw', 'mds', 'mon', 'gatherkeys', 'disk', 'osd',
-    'admin', 'config', 'uninstall', 'purgedata', 'purge', 'pkg', 'calamari'
+    'admin', 'config', 'uninstall', 'purgedata', 'purge', 'pkg'
 ]
 SUBCMDS_WITHOUT_ARGS = ['forgetkeys']
 

diff --git a/ceph_deploy/tests/unit/test_calamari.py b/ceph_deploy/tests/unit/test_calamari.py
diff --git a/setup.py b/setup.py
@@ -72,7 +72,6 @@ def read(fname):
             'config = ceph_deploy.config:make',
             'admin = ceph_deploy.admin:make',
             'pkg = ceph_deploy.pkg:make',
-            'calamari = ceph_deploy.calamari:make',
             'rgw = ceph_deploy.rgw:make',
             'repo = ceph_deploy.repo:make',
             ],