From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 12 Aug 2016 15:28:03 +0000 (-0400)
Subject: ceph-common: convert ceph_stable_rh_storage to ceph_rhcs in main task
X-Git-Tag: v1.0.6~27^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23051e7ea5658e1daf0ffb8e404d70fdc4805c94;p=ceph-ansible.git

ceph-common: convert ceph_stable_rh_storage to ceph_rhcs in main task

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: issue#811
---

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index cd87f5e70..54edb2256 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -11,15 +11,15 @@
 
 - include: ./pre_requisites/prerequisite_rh_storage_iso_install.yml
   when:
-    - ceph_stable_rh_storage
-    - ceph_stable_rh_storage_iso_install
+    - ceph_rhcs
+    - ceph_rhcs_iso_install
   tags:
     - package-install
 
 - include: ./pre_requisites/prerequisite_rh_storage_cdn_install.yml
   when:
-    - ceph_stable_rh_storage
-    - ceph_stable_rh_storage_cdn_install
+    - ceph_rhcs
+    - ceph_rhcs_cdn_install
     - ansible_os_family == "RedHat"
   tags:
     - package-install
@@ -27,28 +27,28 @@
 - include: ./installs/install_on_redhat.yml
   when:
     ansible_os_family == 'RedHat' and
-    not ceph_stable_rh_storage_iso_install
+    not ceph_rhcs_iso_install
   tags:
     - package-install
 
 - include: ./installs/install_rh_storage_on_redhat.yml
   when:
     - ansible_distribution == "RedHat"
-    - ceph_stable_rh_storage
+    - ceph_rhcs
   tags:
     - package-install
 
 - include: ./installs/install_on_debian.yml
   when:
     - ansible_os_family == 'Debian'
-    - not ceph_stable_rh_storage
+    - not ceph_rhcs
   tags:
     - package-install
 
 - include: ./installs/install_rh_storage_on_debian.yml
   when:
     - ansible_os_family == 'Debian'
-    - ceph_stable_rh_storage
+    - ceph_rhcs
   tags:
     - package-install