Optionally install ceph-test

We want this to enable testing with existing teuthology jobs.

https://github.com/ceph/teuthology

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 04266d8062b2474e1b3ff3442bef9f8dfd5e7d31..3effe89058a177b45845779bb46304aeae2c1bd5 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -43,6 +43,9 @@ redhat_package_dependencies:
   - ntp
   - python-setuptools
 
+# Whether or not to install the ceph-test package.
+ceph_test: False
+
 ## Configure package origin
 #
 ceph_origin: 'upstream' # or 'distro'

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index 5f9157e3cd80dca7b785c4e4563d13f93b09d32f..0cb09785cbf18ac62a6a151ddf7827aceb5c3874 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -24,6 +24,13 @@
     - ceph-mds       #|--> they don't get update so we need to force them
     - libcephfs1     #|
 
+- name: install ceph-test
+  apt:
+    pkg: ceph-test
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+    default_release: "{{ ansible_distribution_release }}{{ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
+  when: ceph_test
+
 - name: install rados gateway
   apt:
     pkg: radosgw

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 021ec580291180de17ea91d2a04a4f565d1d3b0a..3717fd7cad945b468ca88f265b9d35d93b6256e4 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -71,6 +71,22 @@
     osd_group_name in group_names and
     ansible_pkg_mgr == "dnf"
 
+- name: install ceph-test
+  yum:
+    name: ceph-test
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  when:
+    ceph_test and
+    ansible_pkg_mgr == "yum"
+
+- name: install ceph-test
+  dnf:
+    name: ceph-test
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  when:
+    ceph_test and
+    ansible_pkg_mgr == "dnf"
+
 - name: install Inktank Ceph Enterprise RBD Kernel modules
   yum:
     name: "{{ item }}"