mirror of https://github.com/ceph/ceph-ansible.git
remove legacy task
this was for backward compatibility concerns, it's time to drop this task. Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>pull/7532/head
parent
51cfba376c
commit
d9e2de1d1d
|
@ -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
|
||||
|
|
|
@ -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') }}"
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue