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

ceph-common: convert ceph_stable_rh_storage to ceph_rhcs in mandatory vars

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

Resolves: issue#811
---

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index e317589b7..ed800d992 100644
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -16,18 +16,18 @@
     - ceph_origin == 'upstream'
     - not ceph_stable
     - not ceph_dev
-    - not ceph_stable_rh_storage
+    - not ceph_rhcs
     - not ceph_stable_uca
   tags:
     - package-install
 
 - name: verify that a method was chosen for red hat storage
   fail:
-    msg: "choose between ceph_stable_rh_storage_cdn_install and ceph_stable_rh_storage_iso_install"
+    msg: "choose between ceph_rhcs_cdn_install and ceph_rhcs_iso_install"
   when:
-    - ceph_stable_rh_storage
-    - not ceph_stable_rh_storage_cdn_install
-    - not ceph_stable_rh_storage_iso_install
+    - ceph_rhcs
+    - not ceph_rhcs_cdn_install
+    - not ceph_rhcs_iso_install
     - ceph_origin == "upstream"
   tags:
     - package-install