From d465af8d21b4b52fcc45a69332cb664e8cdb35f5 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 14 Mar 2024 13:44:19 +0100 Subject: [PATCH] remove legacy task this was for backward compatibility concerns, it's time to drop this task. Signed-off-by: Guillaume Abrioux (cherry picked from commit d9e2de1d1d84fee877707460328a232512680025) --- infrastructure-playbooks/cephadm-adopt.yml | 12 ------------ infrastructure-playbooks/purge-dashboard.yml | 7 ------- infrastructure-playbooks/rolling_update.yml | 6 ------ .../tasks/convert_grafana_server_group_name.yml | 9 --------- roles/ceph-facts/tasks/main.yml | 4 ---- 5 files changed, 38 deletions(-) delete mode 100644 roles/ceph-facts/tasks/convert_grafana_server_group_name.yml diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 1ea7534d9..7d312d7fb 100644 --- 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 c01983ff9..7c9ae393b 100644 --- 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 6aec239e4..7cd672c6b 100644 --- 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 index 5d26298f7..000000000 --- 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 ba58f84b9..392ded93a 100644 --- 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 -- 2.39.5