From b27684d91248adea831fb14d63ad5a9099a4f84b Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 19 Feb 2016 16:39:33 -0700 Subject: [PATCH] Optionally install ceph-test We want this to enable testing with existing teuthology jobs. https://github.com/ceph/teuthology Signed-off-by: Zack Cerza --- roles/ceph-common/defaults/main.yml | 3 +++ .../tasks/installs/install_on_debian.yml | 7 +++++++ .../tasks/installs/install_on_redhat.yml | 16 ++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 04266d806..3effe8905 100644 --- 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 5f9157e3c..0cb09785c 100644 --- 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 021ec5802..3717fd7ca 100644 --- 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 }}"