From e835b08f8feee2dc4bea7829b418db0233a5765a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 11 Jan 2021 16:55:40 +0100 Subject: [PATCH] fs2bs: remove a legacy fact since cf7345f143148a6be2d71954f829a8f7fe11ab22, we don't need to set this fact anymore. Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/filestore-to-bluestore.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/infrastructure-playbooks/filestore-to-bluestore.yml b/infrastructure-playbooks/filestore-to-bluestore.yml index 8534327d7..e28a7c27a 100644 --- a/infrastructure-playbooks/filestore-to-bluestore.yml +++ b/infrastructure-playbooks/filestore-to-bluestore.yml @@ -33,13 +33,12 @@ name: ceph-facts tasks_from: container_binary.yml - - name: set_fact container_run_cmd, container_exec_cmd + - name: set_fact ceph_cmd set_fact: - container_run_cmd: "{{ container_binary + ' run --rm --privileged=true --net=host --pid=host --ipc=host -v /dev:/dev -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph -v /var/run:/var/run --entrypoint=' if containerized_deployment | bool else '' }}ceph-volume {{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else '' }}" - container_exec_cmd: "{{ container_binary + ' exec ceph-mon-' + hostvars[groups[mon_group_name][0]]['ansible_hostname'] if containerized_deployment | bool else '' }}" + ceph_cmd: "{{ container_binary + ' run --rm --net=host -v /etc/ceph:/etc/ceph:z -v /var/lib/ceph:/var/lib/ceph:z -v /var/run/ceph:/var/run/ceph:z --entrypoint=ceph ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else 'ceph' }}" - name: get ceph osd tree data - command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd tree -f json" + command: "{{ ceph_cmd }} --cluster {{ cluster }} osd tree -f json" delegate_to: "{{ groups[mon_group_name][0] }}" register: osd_tree changed_when: false @@ -52,7 +51,7 @@ - "{{ ((osd_tree.stdout | default('{}') | trim | from_json).nodes | selectattr('name', 'match', '^' + inventory_hostname + '$') | map(attribute='children') | list) }}" - name: get osd metadata - command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd metadata osd.{{ item }} -f json" + command: "{{ ceph_cmd }} --cluster {{ cluster }} osd metadata osd.{{ item }} -f json" register: osd_metadata delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true -- 2.39.5