From: Sage Weil <sage@redhat.com>
Date: Wed, 2 Sep 2015 20:11:11 +0000 (-0400)
Subject: install: add --test install option to install ceph-test package
X-Git-Tag: v1.5.29~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=519584957f2452b09abd2c491ea4b73440f053b6;p=ceph-deploy.git

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 fafb2f1..7758af9 100644
--- 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 abd1fe7..a8bd326 100644
--- 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([