remove legacy task

this was for backward compatibility concerns, it's time to drop this
task.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit d9e2de1d1d84fee877707460328a232512680025)

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 1ea7534d95c7ccb2b1227a1d822d0fb7996d7057..7d312d7fbc74e5c2ce6c9bde64cb68865ee48c89 100644 (file)
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -27,12 +27,6 @@
       ansible.builtin.import_role:
         name: ceph-defaults
 
-    - name: Check if a legacy grafana-server group exists
-      ansible.builtin.import_role:
-        name: ceph-facts
-        tasks_from: convert_grafana_server_group_name.yml
-      when: groups.get((grafana_server_group_name | default('grafana-server')), []) | length > 0
-
 - name: Gather facts and prepare system for cephadm
   hosts:
     - "{{ mon_group_name|default('mons') }}"
@@ -98,12 +92,6 @@
         - (health_detail.stdout | default('{}', True) | from_json)['status'] == "HEALTH_WARN"
         - "'POOL_APP_NOT_ENABLED' in (health_detail.stdout | default('{}', True) | from_json)['checks']"
 
-    - name: Import ceph-facts role
-      ansible.builtin.import_role:
-        name: ceph-facts
-        tasks_from: convert_grafana_server_group_name.yml
-      when: groups.get((grafana_server_group_name | default('grafana-server')), []) | length > 0
-
     - name: Get the ceph version
       ansible.builtin.command: "{{ container_binary + ' run --rm --entrypoint=ceph ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else 'ceph' }} --version"
       changed_when: false

diff --git a/infrastructure-playbooks/purge-dashboard.yml b/infrastructure-playbooks/purge-dashboard.yml
index c01983ff931b7f684dfb89adbea4309d586adc7d..7c9ae393bc5fe7f8b957250a3ac569afa2fe022d 100644 (file)
--- a/infrastructure-playbooks/purge-dashboard.yml
+++ b/infrastructure-playbooks/purge-dashboard.yml
@@ -35,13 +35,6 @@
       ansible.builtin.import_role:
         name: ceph-defaults
 
-    - name: Check if a legacy grafana-server group exists
-      ansible.builtin.import_role:
-        name: ceph-facts
-        tasks_from: convert_grafana_server_group_name.yml
-      when: groups.get((grafana_server_group_name | default('grafana-server')), []) | length > 0
-
-
 - name: Gather facts on all hosts
   hosts:
     - "{{ mon_group_name|default('mons') }}"

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 6aec239e489883e58693740b09da097b6af37e06..7cd672c6b0cadbee36464f70831d67f4b21b1637 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -37,12 +37,6 @@
       ansible.builtin.import_role:
         name: ceph-defaults
 
-    - name: Check if a legacy grafana-server group exists
-      ansible.builtin.import_role:
-        name: ceph-facts
-        tasks_from: convert_grafana_server_group_name.yml
-      when: groups.get((grafana_server_group_name | default('grafana-server')), []) | length > 0
-
 
 - name: Gather facts and check the init system
   hosts:

diff --git a/roles/ceph-facts/tasks/convert_grafana_server_group_name.yml b/roles/ceph-facts/tasks/convert_grafana_server_group_name.yml
deleted file mode 100644 (file)
index 5d26298..0000000
--- a/roles/ceph-facts/tasks/convert_grafana_server_group_name.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Convert grafana-server group name if exist
-  ansible.builtin.add_host:
-    name: "{{ item }}"
-    groups: "{{ monitoring_group_name }}"
-    ansible_host: "{{ hostvars[item]['ansible_host'] | default(omit) }}"
-    ansible_port: "{{ hostvars[item]['ansible_port'] | default(omit) }}"
-  with_items: "{{ groups.get((grafana_server_group_name | default('grafana-server')), []) }}"
-  run_once: true

diff --git a/roles/ceph-facts/tasks/main.yml b/roles/ceph-facts/tasks/main.yml
index ba58f84b9cf57a4a3a7d6d874c7981887cc2dc8c..392ded93a5a7599e7068f546e17ee5f5c22df833 100644 (file)
--- a/roles/ceph-facts/tasks/main.yml
+++ b/roles/ceph-facts/tasks/main.yml
@@ -1,7 +1,3 @@
 ---
-- name: Include_tasks convert_grafana_server_group_name.yml
-  ansible.builtin.include_tasks: convert_grafana_server_group_name.yml
-  when: groups.get((grafana_server_group_name|default('grafana-server')), []) | length > 0
-
 - name: Include facts.yml
   ansible.builtin.include_tasks: facts.yml