mirror of https://github.com/ceph/ceph-ansible.git
ceph-docker: osd fix container prep and start
We now check if the device has already been prepared, if we detect a ceph partition we do not prepare the device. Also fixed some issues while running on Atomic or CoreOS. Signed-off-by: Sébastien Han <seb@redhat.com>pull/673/head
parent
df6c3f4f72
commit
00819ab7b8
|
@ -9,6 +9,13 @@
|
||||||
state: unmounted
|
state: unmounted
|
||||||
when: ceph_docker_on_openstack
|
when: ceph_docker_on_openstack
|
||||||
|
|
||||||
|
- name: verify if the disk was already prepared
|
||||||
|
shell: "lsblk -o PARTLABEL {{ item }} | grep -sq 'ceph'"
|
||||||
|
failed_when: false
|
||||||
|
changed_when: false
|
||||||
|
with_items: ceph_osd_docker_devices
|
||||||
|
register: osd_prepared
|
||||||
|
|
||||||
- name: prepare ceph osd disk
|
- name: prepare ceph osd disk
|
||||||
docker:
|
docker:
|
||||||
image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
|
image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
|
||||||
|
@ -17,12 +24,17 @@
|
||||||
pid: host
|
pid: host
|
||||||
state: running
|
state: running
|
||||||
privileged: yes
|
privileged: yes
|
||||||
env: "OSD_DEVICE={{ item }},{{ ceph_osd_docker_prepare_env }}"
|
env: "OSD_DEVICE={{ item.0 }},{{ ceph_osd_docker_prepare_env }}"
|
||||||
volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/dev/:/dev/"
|
volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,{{ item.0 }}:{{ item.0 }}"
|
||||||
with_items: ceph_osd_docker_devices
|
with_together:
|
||||||
|
- ceph_osd_docker_devices
|
||||||
|
- osd_prepared.results
|
||||||
when:
|
when:
|
||||||
|
item.1.get("rc", 0) != 0 and
|
||||||
ceph_osd_docker_prepare_env is defined and
|
ceph_osd_docker_prepare_env is defined and
|
||||||
not osd_containerized_deployment_with_kv
|
not osd_containerized_deployment_with_kv and
|
||||||
|
not is_atomic and
|
||||||
|
not ansible_os_family == 'CoreOS'
|
||||||
|
|
||||||
- name: prepare ceph osd disk with kv_store
|
- name: prepare ceph osd disk with kv_store
|
||||||
docker:
|
docker:
|
||||||
|
@ -32,12 +44,63 @@
|
||||||
pid: host
|
pid: host
|
||||||
state: running
|
state: running
|
||||||
privileged: yes
|
privileged: yes
|
||||||
volumes: "/dev/:/dev/"
|
volumes: "{{ item.0 }}:{{ item.0 }}"
|
||||||
env: "OSD_DEVICE={{ item }},KV_TYPE={{kv_type}},KV_IP={{kv_endpoint}},{{ ceph_osd_docker_prepare_env }}"
|
env: "OSD_DEVICE={{ item.0 }},KV_TYPE={{kv_type}},KV_IP={{kv_endpoint}},{{ ceph_osd_docker_prepare_env }}"
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
with_items: ceph_osd_docker_devices
|
with_together:
|
||||||
|
- ceph_osd_docker_devices
|
||||||
|
- osd_prepared.results
|
||||||
when:
|
when:
|
||||||
|
item.1.get("rc", 0) != 0 and
|
||||||
ceph_osd_docker_prepare_env is defined and
|
ceph_osd_docker_prepare_env is defined and
|
||||||
|
osd_containerized_deployment_with_kv and
|
||||||
|
not is_atomic and
|
||||||
|
not ansible_os_family == 'CoreOS'
|
||||||
|
|
||||||
|
me: prepare ceph osd disk for container operating systems
|
||||||
|
shell: |
|
||||||
|
docker run -d --net=host \
|
||||||
|
--pid=host \
|
||||||
|
--privileged=true \
|
||||||
|
-v /etc/ceph:/etc/ceph \
|
||||||
|
-v /var/lib/ceph/:/var/lib/ceph/ \
|
||||||
|
-v {{ item.0 }}:{{ item.0 }} \
|
||||||
|
-e OSD_DEVICE="{{ item.0 }}" \
|
||||||
|
-e "{{ ceph_osd_docker_prepare_env }}" \
|
||||||
|
"{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}" \
|
||||||
|
osd_ceph_disk_prepare
|
||||||
|
failed_when: false
|
||||||
|
changed_when: false
|
||||||
|
with_together:
|
||||||
|
- ceph_osd_docker_devices
|
||||||
|
- osd_prepared.results
|
||||||
|
when:
|
||||||
|
item.1.get("rc", 0) != 0 and
|
||||||
|
is_atomic or
|
||||||
|
ansible_os_family == 'CoreOS' and
|
||||||
|
not osd_containerized_deployment_with_kv
|
||||||
|
|
||||||
|
- name: prepare ceph osd disk for container operating systems with kv_store
|
||||||
|
shell: |
|
||||||
|
docker run -d --net=host \
|
||||||
|
--pid=host \
|
||||||
|
--privileged=true \
|
||||||
|
-e KV_TYPE={{ kv_type }} \
|
||||||
|
-e KV_IP={{ kv_endpoint }} \
|
||||||
|
-v {{ item.0 }}:{{ item.0 }} \
|
||||||
|
-e OSD_DEVICE={{ item.0 }} \
|
||||||
|
-e "{{ ceph_osd_docker_prepare_env }}" \
|
||||||
|
"{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}" \
|
||||||
|
osd_ceph_disk_prepare
|
||||||
|
failed_when: false
|
||||||
|
changed_when: false
|
||||||
|
with_together:
|
||||||
|
- ceph_osd_docker_devices
|
||||||
|
- osd_prepared.results
|
||||||
|
when:
|
||||||
|
item.1.get("rc", 0) != 0 and
|
||||||
|
is_atomic or
|
||||||
|
ansible_os_family == 'CoreOS' and
|
||||||
osd_containerized_deployment_with_kv
|
osd_containerized_deployment_with_kv
|
||||||
|
|
||||||
# Use systemd to manage container on Atomic host
|
# Use systemd to manage container on Atomic host
|
||||||
|
@ -50,6 +113,9 @@
|
||||||
group: "root"
|
group: "root"
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
when:
|
||||||
|
is_atomic or
|
||||||
|
ansible_os_family == 'CoreOS'
|
||||||
|
|
||||||
- name: link systemd unit file for osd instance
|
- name: link systemd unit file for osd instance
|
||||||
file:
|
file:
|
||||||
|
|
Loading…
Reference in New Issue