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 #2153 from ceph/fix_disk_list_test 

osd: always run disk_list test
pull/2163/head
Guillaume Abrioux 2017-11-09 23:50:32 +01:00 committed by GitHub
parent 4c2d98f18c 591d77220e
commit a695b2c08f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,6 @@
changed_when: false changed_when: false
failed_when: false failed_when: false
register: disk_list register: disk_list
when:
- ceph_release_num[ceph_release] < ceph_release_num.kraken
- name: generate ceph osd docker run script - name: generate ceph osd docker run script
become: true become: true

2
roles/ceph-osd/templates/ceph-osd-run.sh.j2
View File

@ -5,7 +5,7 @@
############# #############
# FUNCTIONS # # FUNCTIONS #
############# #############
{% if disk_list.get("rc", 1) == 0 -%} {% if disk_list.get('rc') == 0 -%}
function expose_partitions () { function expose_partitions () {
DOCKER_ENV=$(docker run --rm --name expose_partitions_${1} --privileged=true -v /dev/:/dev/ -v /etc/ceph:/etc/ceph -e CLUSTER={{ cluster }} -e OSD_DEVICE=/dev/${1} {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} disk_list) DOCKER_ENV=$(docker run --rm --name expose_partitions_${1} --privileged=true -v /dev/:/dev/ -v /etc/ceph:/etc/ceph -e CLUSTER={{ cluster }} -e OSD_DEVICE=/dev/${1} {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} disk_list)
docker rm -f expose_partitions_${1} docker rm -f expose_partitions_${1}