common: rename rh_storage to rhcs to match product name

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1203/head
Sébastien Han 2016-12-20 13:47:44 +01:00
parent 775d61ed09
commit d44927de03
3 changed files with 8 additions and 8 deletions

View File

@ -15,7 +15,7 @@
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./pre_requisites/prerequisite_rh_storage_iso_install.yml
- include: ./pre_requisites/prerequisite_rhcs_iso_install.yml
when:
- ceph_rhcs
- ceph_rhcs_iso_install
@ -24,7 +24,7 @@
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./pre_requisites/prerequisite_rh_storage_cdn_install.yml
- include: ./pre_requisites/prerequisite_rhcs_cdn_install.yml
when:
- ceph_rhcs
- ceph_rhcs_cdn_install

View File

@ -9,7 +9,7 @@
shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms
changed_when: false
failed_when: false
register: rh_storage_mon_repo
register: rhcs_mon_repo
always_run: true
when: mon_group_name in group_names
@ -18,13 +18,13 @@
changed_when: false
when:
- mon_group_name in group_names
- rh_storage_mon_repo.rc != 0
- rhcs_mon_repo.rc != 0
- name: check if the red hat storage osd repo is already present
shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms
changed_when: false
failed_when: false
register: rh_storage_osd_repo
register: rhcs_osd_repo
always_run: true
when: osd_group_name in group_names
@ -33,13 +33,13 @@
changed_when: false
when:
- osd_group_name in group_names
- rh_storage_osd_repo.rc != 0
- rhcs_osd_repo.rc != 0
- name: check if the red hat storage rados gateway / mds repo is already present
shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms
changed_when: false
failed_when: false
register: rh_storage_rgw_mds_repo
register: rhcs_rgw_mds_repo
always_run: true
when: (rgw_group_name in group_names or mds_group_name in group_names)
@ -48,4 +48,4 @@
changed_when: false
when:
- (rgw_group_name in group_names or mds_group_name in group_names)
- rh_storage_rgw_mds_repo.rc != 0
- rhcs_rgw_mds_repo.rc != 0