From 32be163360f676e079d311d417a9151e0178d8b6 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 2 Oct 2020 11:00:29 +0200 Subject: [PATCH] ceph-osd: refact `docker_exec_start_osd` This commit drops nested jinja construction in this set_fact task. It also rename it to `container_exec_start_osd` Signed-off-by: Guillaume Abrioux (cherry picked from commit ff95fa9c32ba6cba486200d2c7734259bd50fd1b) --- roles/ceph-osd/tasks/start_osds.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/ceph-osd/tasks/start_osds.yml b/roles/ceph-osd/tasks/start_osds.yml index b3b99f4a6..37a44db95 100644 --- a/roles/ceph-osd/tasks/start_osds.yml +++ b/roles/ceph-osd/tasks/start_osds.yml @@ -19,12 +19,12 @@ changed_when: false register: osd_ids_non_container -- name: set_fact docker_exec_start_osd +- name: set_fact container_exec_start_osd set_fact: - docker_exec_start_osd: "{{ '{{ container_binary }} run --rm --net=host --privileged=true -v /var/run/udev/:/var/run/udev/:z -v /run/lvm/:/run/lvm/ -v /etc/ceph:/etc/ceph:z -v /dev:/dev --entrypoint=ceph-volume ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else 'ceph-volume' }}" + container_exec_start_osd: "{{ container_binary + ' run --rm --net=host --privileged=true -v /var/run/udev/:/var/run/udev/:z -v /run/lvm/:/run/lvm/ -v /etc/ceph:/etc/ceph:z -v /dev:/dev --entrypoint=ceph-volume ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else 'ceph-volume' }}" - name: collect osd ids - command: "{{ docker_exec_start_osd }} lvm list --format json" + command: "{{ container_exec_start_osd }} lvm list --format json" changed_when: false failed_when: false register: ceph_osd_ids