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

Merge pull request #1551 from ceph/revert-1531-wip-1495 

Revert "docker: Retry OSD disk prepare to workaround race condition"
pull/1407/merge
Sébastien Han 2017-05-18 16:06:58 +02:00 committed by GitHub
parent e189d7caa6 6bdadc4363
commit 99a11e216f
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
roles/ceph-osd/tasks/docker/start_docker_osd.yml
View File

@ -21,12 +21,10 @@
# starting the next task # starting the next task
- name: prepare ceph osd disk - name: prepare ceph osd disk
shell: | shell: |
NAME="ceph-osd-prepare-{{ ansible_hostname }}-dev{{ item.0 | regex_replace('/', '') }}"
docker ps -a | grep -sq $NAME && docker rm $NAME || true
docker run --net=host \ docker run --net=host \
--pid=host \ --pid=host \
--privileged=true \ --privileged=true \
--name=$NAME \ --name="ceph-osd-prepare-{{ ansible_hostname }}-dev{{ item.0 | regex_replace('/', '') }}" \
-v /etc/ceph:/etc/ceph \ -v /etc/ceph:/etc/ceph \
-v /var/lib/ceph/:/var/lib/ceph/ \ -v /var/lib/ceph/:/var/lib/ceph/ \
-v /dev:/dev \ -v /dev:/dev \
@ -43,20 +41,13 @@
- item.1.get("rc", 0) != 0 - item.1.get("rc", 0) != 0
- ceph_osd_docker_prepare_env is defined - ceph_osd_docker_prepare_env is defined
- not osd_containerized_deployment_with_kv - not osd_containerized_deployment_with_kv
# https://github.com/ceph/ceph-ansible/issues/1495
register: prepare_osd_disk
until: prepare_osd_disk.rc == 0
retries: 5
delay: 3
- name: prepare ceph osd disk with kv_store - name: prepare ceph osd disk with kv_store
shell: | shell: |
NAME="ceph-osd-prepare-{{ ansible_hostname }}-dev-{{ item.0 | regex_replace('/', '') }}"
docker ps -a | grep -sq $NAME && docker rm $NAME || true
docker run --net=host \ docker run --net=host \
--pid=host \ --pid=host \
--privileged=true \ --privileged=true \
--name=$NAME \ --name="ceph-osd-prepare-{{ ansible_hostname }}-dev-{{ item.0 | regex_replace('/', '') }}" \
-v /dev:/dev \ -v /dev:/dev \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-e "OSD_DEVICE={{ item.0 }}" \ -e "OSD_DEVICE={{ item.0 }}" \
@ -75,11 +66,6 @@
- item.1.get("rc", 0) != 0 - item.1.get("rc", 0) != 0
- ceph_osd_docker_prepare_env is defined - ceph_osd_docker_prepare_env is defined
- osd_containerized_deployment_with_kv - osd_containerized_deployment_with_kv
# https://github.com/ceph/ceph-ansible/issues/1495
register: prepare_osd_disk_kv
until: prepare_osd_disk_kv.rc == 0
retries: 5
delay: 3
- name: generate ceph osd docker run script - name: generate ceph osd docker run script
become: true become: true