install: add --test install option to install ceph-test package

We need this for the teuthology tests.

Don't include it in --all, since any normal person does not want it.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index fafb2f17e7e35711199c2e87a016527505aa9d1b..7758af97e8105f4e28ba1202d528262b59d20175 100644 (file)
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -56,6 +56,7 @@ def detect_components(args, distro):
         'install_mds': 'ceph-mds',
         'install_mon': 'ceph-mon',
         'install_common': 'ceph-common',
+        'install_tests': 'ceph-test',
     }
 
     if distro.is_rpm:
@@ -521,6 +522,13 @@ def make(parser):
         help='install the osd component only',
     )
 
+    parser.add_argument(
+        '--tests',
+        dest='install_tests',
+        action='store_true',
+        help='install the testing components',
+    )
+
     parser.add_argument(
         '--cli', '--common',
         dest='install_common',
@@ -532,7 +540,7 @@ def make(parser):
         '--all',
         dest='install_all',
         action='store_true',
-        help='install all Ceph components (e.g. mon,osd,mds,rgw). This is the default',
+        help='install all Ceph components (mon, osd, mds, rgw) except tests. This is the default',
     )
 
     repo = parser.add_mutually_exclusive_group()

diff --git a/ceph_deploy/tests/test_install.py b/ceph_deploy/tests/test_install.py
index abd1fe75bf8485963e01e32c11f8b0d14cc803fb..a8bd3265f2fadfe77490c004d55693b6533e8e47 100644 (file)
--- a/ceph_deploy/tests/test_install.py
+++ b/ceph_deploy/tests/test_install.py
@@ -48,6 +48,7 @@ class TestDetectComponents(object):
         self.args.install_mon = False
         self.args.install_osd = False
         self.args.install_rgw = False
+        self.args.install_tests = False
         self.args.install_common = False
         self.args.repo = False
         self.distro = Mock()
@@ -106,6 +107,11 @@ class TestDetectComponents(object):
         result = sorted(install.detect_components(self.args, self.distro))
         assert result == sorted(['ceph-osd', 'ceph-mds'])
 
+    def test_install_tests(self):
+        self.args.install_tests = True
+        result = sorted(install.detect_components(self.args, self.distro))
+        assert result == sorted(['ceph-test'])
+
     def test_install_all_should_be_default_when_no_options_passed(self):
         result = sorted(install.detect_components(self.args, self.distro))
         assert result == sorted([