From fd95716e57b75f28dfbe862f41ee0d6a4d20c1fc Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Tue, 26 Jun 2018 14:41:14 -0700 Subject: [PATCH] Enable monitor repo for mgr nodes and Tools repo for iscsi/nfs/clients Signed-off-by: Vasu Kulkarni (cherry picked from commit 1d454b611f9ec5403a474fcb45a6333ca6d36715) --- .../prerequisite_rhcs_cdn_install.yml | 2 +- .../prerequisite_rhcs_cdn_install_debian.yml | 29 +++++-------------- 2 files changed, 9 insertions(+), 22 deletions(-) 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 c4d713185..a171066b5 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml @@ -12,7 +12,7 @@ command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms changed_when: false when: - - mon_group_name in group_names + - (mon_group_name in group_names or mgr_group_name in group_names) - rhcs_mon_repo.rc != 0 - name: check if the red hat storage osd repo is already present diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml index 98dd58bcc..d66e7d337 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml @@ -6,24 +6,11 @@ - name: enable red hat storage monitor repository for debian systems apt_repository: - repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/MON {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" - state: present - changed_when: false - when: - - mon_group_name in group_names - -- name: enable red hat storage osd repository for debian systems - apt_repository: - repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/OSD {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" - state: present - changed_when: false - when: - - osd_group_name in group_names - -- name: enable red hat storage rados gateway / mds repository for debian systems - apt_repository: - repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/Tools {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" - state: present - changed_when: false - when: - - (rgw_group_name in group_names or mds_group_name in group_names) + repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/{{ item.repo }} {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" state: present + update_cache: no + register: add_debian_apt_repo + with_items: + - { repo: "MON", configure: (mon_group_name in group_names or mgr_group_name in group_names) } + - { repo: "OSD", configure: (osd_group_name in group_names) } + - { repo: "Tools", configure: (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names) } + when: item.configure -- 2.47.3