From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 12 Apr 2017 12:55:03 +0000 (-0500)
Subject: ceph-common: is ceph_rchs is True do not include install_on_redhat.yml
X-Git-Tag: v2.3.0rc1~53^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37d38b122bde02efc1bde0d61ceeee3999ebb7ff;p=ceph-ansible.git

ceph-common: is ceph_rchs is True do not include install_on_redhat.yml

That task includes logic for upstream installs that we do not want to
run when deploying RHCS.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 360c21232..ca25812f7 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -38,8 +38,8 @@
 
 - include: ./installs/install_on_redhat.yml
   when:
-    ansible_os_family == 'RedHat' and
-    not ceph_rhcs_iso_install
+    - ansible_os_family == 'RedHat'
+    - not ceph_rhcs
   tags:
     - package-install
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)