From dd7f21bd920055f38220868244a56fdbcafe9ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 18 Sep 2017 23:56:38 +0200 Subject: [PATCH] common: fix rhcs installation and rgw package for nfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RHCS install wasn't working at all prior to this commit as the name of the include was pointing to a non-existing file. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1492056 Signed-off-by: Sébastien Han --- .../tasks/installs/prerequisite_rhcs_cdn_install.yml | 8 ++++---- ...terprise_repository.yml => redhat_rhcs_repository.yml} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename roles/ceph-common/tasks/installs/{redhat_enterprise_repository.yml => redhat_rhcs_repository.yml} (100%) diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml index 5a8932137..1b22afda4 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml @@ -35,14 +35,14 @@ shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms changed_when: false failed_when: false - register: rhcs_rgw_mds_repo + register: rhcs_rgw_mds_nfs_repo always_run: true when: - - (rgw_group_name in group_names or mds_group_name in group_names) + - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names) - name: enable red hat storage rados gateway / mds repository command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms changed_when: false when: - - (rgw_group_name in group_names or mds_group_name in group_names) - - rhcs_rgw_mds_repo.rc != 0 + - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names) + - rhcs_rgw_mds_nfs_repo.rc != 0 diff --git a/roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml b/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml similarity index 100% rename from roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml rename to roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml