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

ceph-osd: do not re-prepare if alreadyy prepared 

I forgot to re-add the partition check while refactoring the osd

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1853/head
Sébastien Han 2017-09-04 23:22:12 +02:00
parent e9d285a98c
commit 1dd976d28e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
roles/ceph-osd/tasks/scenarios/collocated.yml
View File

@ -7,22 +7,26 @@
docker run --net=host \ docker run --net=host \
--pid=host \ --pid=host \
--privileged=true \ --privileged=true \
--name=ceph-osd-prepare-{{ ansible_hostname }}-dev{{ item.1 | regex_replace('/', '') }} \ --name=ceph-osd-prepare-{{ ansible_hostname }}-dev{{ item.2 | 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 \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-e CLUSTER={{ cluster }} \ -e CLUSTER={{ cluster }} \
-e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \ -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \
-e OSD_DEVICE={{ item.1 }} \ -e OSD_DEVICE={{ item.2 }} \
{{ docker_env_args }} \ {{ docker_env_args }} \
{{ ceph_osd_docker_prepare_env }} \ {{ ceph_osd_docker_prepare_env }} \
{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
with_together: with_together:
- "{{ parted_results.results }}" - "{{ parted_results.results | default([]) }}"
- "{{ ispartition_results.results | default([]) }}"
- "{{ devices }}" - "{{ devices }}"
when: when:
- not item.0.get("skipped") - not item.0.get("skipped")
- not item.1.get("skipped")
- item.0.get("rc", 0) != 0
- item.1.get("rc", 0) != 0
- not osd_auto_discovery - not osd_auto_discovery
- containerized_deployment - containerized_deployment
@ -68,8 +72,8 @@
- name: manually prepare ceph "{{ osd_objectstore }}" non-containerized osd disk(s) with collocated osd data and journal - name: manually prepare ceph "{{ osd_objectstore }}" non-containerized osd disk(s) with collocated osd data and journal
command: "ceph-disk prepare {{ ceph_disk_cli_options }} {{ item.2 }}" command: "ceph-disk prepare {{ ceph_disk_cli_options }} {{ item.2 }}"
with_together: with_together:
- "{{ parted_results.results }}" - "{{ parted_results.results | default([]) }}"
- "{{ ispartition_results.results }}" - "{{ ispartition_results.results | default([]) }}"
- "{{ devices }}" - "{{ devices }}"
when: when:
- not item.0.get("skipped") - not item.0.get("skipped")