From d44927de0383d9613e81cabb998b74b17656b78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 20 Dec 2016 13:47:44 +0100 Subject: [PATCH] common: rename rh_storage to rhcs to match product name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- roles/ceph-common/tasks/main.yml | 4 ++-- ...install.yml => prerequisite_rhcs_cdn_install.yml} | 12 ++++++------ ...install.yml => prerequisite_rhcs_iso_install.yml} | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename roles/ceph-common/tasks/pre_requisites/{prerequisite_rh_storage_cdn_install.yml => prerequisite_rhcs_cdn_install.yml} (89%) rename roles/ceph-common/tasks/pre_requisites/{prerequisite_rh_storage_iso_install.yml => prerequisite_rhcs_iso_install.yml} (100%) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 4691f6575..fcbe7c26f 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -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 diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml b/roles/ceph-common/tasks/pre_requisites/prerequisite_rhcs_cdn_install.yml similarity index 89% rename from roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml rename to roles/ceph-common/tasks/pre_requisites/prerequisite_rhcs_cdn_install.yml index 255550dc6..5e7603c0b 100644 --- a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml +++ b/roles/ceph-common/tasks/pre_requisites/prerequisite_rhcs_cdn_install.yml @@ -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 diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml b/roles/ceph-common/tasks/pre_requisites/prerequisite_rhcs_iso_install.yml similarity index 100% rename from roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_iso_install.yml rename to roles/ceph-common/tasks/pre_requisites/prerequisite_rhcs_iso_install.yml