From a391dad8e140288f26718a04102a4e65d255cfd2 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 26 May 2021 12:04:20 +0200 Subject: [PATCH] dashboard: fix typo introduced during backport during backport of c8b92deba10c0b6e0ebcb0e31315b1e6174fdc0c the pattern should have been s/monitoring_group_name/grafana_server_group_name/ Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1964907 Signed-off-by: Guillaume Abrioux (cherry picked from commit ac0a5c1e682e0a6e6c67d7c3c630b1da110785bb) --- infrastructure-playbooks/rolling_update.yml | 2 +- .../tasks/installs/prerequisite_rhcs_cdn_install.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 3bc82b3d6..899537efc 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -987,7 +987,7 @@ - "{{ rbdmirror_group_name|default('rbdmirrors') }}" - "{{ nfs_group_name|default('nfss') }}" - "{{ iscsi_gw_group_name|default('iscsigws') }}" - - "{{ monitoring_group_name|default('monitoring') }}" + - "{{ grafana_server_group_name|default('grafana-server') }}" gather_facts: false become: true tasks: 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 f53302ef3..05dc07a04 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml @@ -15,7 +15,7 @@ - name: enable red hat storage tools repository rhsm_repository: name: "rhceph-{{ ceph_rhcs_version }}-tools-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms" - when: (mgr_group_name in group_names or 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 or monitoring_group_name in group_names) + when: (mgr_group_name in group_names or 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 or grafana_server_group_name in group_names) - name: "rhcs {{ ceph_rhcs_version }} on rhel 7" when: ansible_facts['distribution_major_version'] | int == 7 @@ -33,4 +33,4 @@ - name: enable red hat storage tools repository rhsm_repository: name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms" - when: (mgr_group_name in group_names or 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 or monitoring_group_name in group_names) + when: (mgr_group_name in group_names or 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 or grafana_server_group_name in group_names)