ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CNI error when net=host is not used on OSD calls 

Follow up fix that 410abd7 missed.

Related: ceph#3561

Signed-off-by: John Fulton <fulton@redhat.com>
pull/3574/head
John Fulton 2019-02-05 15:28:37 -05:00 committed by mergify[bot]
parent 719a25b571
commit cc0bf197e1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph-osd/tasks/start_osds.yml
View File

@ -12,7 +12,7 @@
- ceph_docker_on_openstack - ceph_docker_on_openstack
- name: test if the container image has the disk_list function - name: test if the container image has the disk_list function
command: "{{ container_binary }} run --rm --entrypoint=stat {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} disk_list.sh" command: "{{ container_binary }} run --rm --net=host --entrypoint=stat {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} disk_list.sh"
changed_when: false changed_when: false
failed_when: false failed_when: false
register: disk_list register: disk_list
@ -41,7 +41,7 @@
- name: set_fact docker_exec_start_osd - name: set_fact docker_exec_start_osd
set_fact: set_fact:
docker_exec_start_osd: "{{ '{{ container_binary }} run --rm --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' }}" 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' }}"
- name: collect osd ids - name: collect osd ids
shell: > shell: >