Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove legacy task
Browse files Browse the repository at this point in the history
this was for backward compatibility concerns, it's time to drop this
task.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
guits committed Mar 14, 2024
1 parent ff10247 commit 6365d66
Showing 5 changed files with 0 additions and 38 deletions.
12 changes: 0 additions & 12 deletions infrastructure-playbooks/cephadm-adopt.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions infrastructure-playbooks/purge-dashboard.yml
Original file line number Diff line number Diff line change
@@ -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') }}"
6 changes: 0 additions & 6 deletions infrastructure-playbooks/rolling_update.yml
Original file line number Diff line number Diff line change
@@ -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:
9 changes: 0 additions & 9 deletions roles/ceph-facts/tasks/convert_grafana_server_group_name.yml

This file was deleted.

4 changes: 0 additions & 4 deletions roles/ceph-facts/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6365d66

Please sign in to comment.