mirror of https://github.com/ceph/ceph-ansible.git
Removing creating symbolic links and fixing systemctl enable not working on CoreOS and migrating form docker module to shell in prepare image
parent
3950751317
commit
26688d10dc
|
@ -41,16 +41,20 @@
|
||||||
- not osd_containerized_deployment_with_kv
|
- not osd_containerized_deployment_with_kv
|
||||||
|
|
||||||
- name: prepare ceph osd disk with kv_store
|
- name: prepare ceph osd disk with kv_store
|
||||||
docker:
|
shell: |
|
||||||
image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
|
docker run --net=host --rm \
|
||||||
name: "{{ ansible_hostname }}-osd-prepare-{{ item.0 | regex_replace('/', '') }}"
|
--pid=host \
|
||||||
net: host
|
--privileged=true \
|
||||||
pid: host
|
--name="{{ ansible_hostname }}-osd-prepare-{{ item.0 |
|
||||||
state: running
|
regex_replace('/', '') }}" \
|
||||||
privileged: yes
|
-v /dev:/dev \
|
||||||
volumes: "{{ item.0 }}:{{ item.0 }}"
|
-e "OSD_DEVICE={{ item.0 }}" \
|
||||||
env: "OSD_DEVICE={{ item.0 }},KV_TYPE={{kv_type}},KV_IP={{kv_endpoint}},{{ ceph_osd_docker_prepare_env }}"
|
-e "{{ ceph_osd_docker_prepare_env }}" \
|
||||||
ignore_errors: true
|
-e CEPH_DAEMON=osd_ceph_disk_prepare \
|
||||||
|
-e KV_TYPE={{kv_type}} \
|
||||||
|
-e KV_IP={{kv_endpoint}} \
|
||||||
|
-e KV_PORT={{kv_port}} \
|
||||||
|
"{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}" \
|
||||||
with_together:
|
with_together:
|
||||||
- ceph_osd_docker_devices
|
- ceph_osd_docker_devices
|
||||||
- osd_prepared.results
|
- osd_prepared.results
|
||||||
|
@ -64,23 +68,15 @@
|
||||||
become: true
|
become: true
|
||||||
template:
|
template:
|
||||||
src: "{{ role_path }}/templates/ceph-osd.service.j2"
|
src: "{{ role_path }}/templates/ceph-osd.service.j2"
|
||||||
dest: /var/lib/ceph/ceph-osd@.service
|
dest: /etc/systemd/system/ceph-osd@.service
|
||||||
owner: "root"
|
owner: "root"
|
||||||
group: "root"
|
group: "root"
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
failed_when: false
|
failed_when: false
|
||||||
when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
|
when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
|
||||||
|
|
||||||
- name: link systemd unit file for osd instance
|
|
||||||
file:
|
|
||||||
src: /var/lib/ceph/ceph-osd@.service
|
|
||||||
dest: /etc/systemd/system/multi-user.target.wants/ceph-osd@{{ item | basename }}.service
|
|
||||||
state: link
|
|
||||||
with_items: ceph_osd_docker_devices
|
|
||||||
when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
|
|
||||||
|
|
||||||
- name: enable systemd unit file for osd instance
|
- name: enable systemd unit file for osd instance
|
||||||
shell: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-osd@{{ item | basename }}.service
|
shell: systemctl enable ceph-osd@{{ item | basename }}.service
|
||||||
failed_when: false
|
failed_when: false
|
||||||
changed_when: false
|
changed_when: false
|
||||||
with_items: ceph_osd_docker_devices
|
with_items: ceph_osd_docker_devices
|
||||||
|
@ -117,18 +113,3 @@
|
||||||
- ansible_os_family != 'CoreOS'
|
- ansible_os_family != 'CoreOS'
|
||||||
- not osd_containerized_deployment_with_kv
|
- not osd_containerized_deployment_with_kv
|
||||||
|
|
||||||
- name: run the ceph osd docker image with kv
|
|
||||||
docker:
|
|
||||||
image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
|
|
||||||
name: "{{ ansible_hostname }}-osd-{{ item | regex_replace('/', '') }}"
|
|
||||||
net: host
|
|
||||||
pid: host
|
|
||||||
state: running
|
|
||||||
privileged: yes
|
|
||||||
env: "KV_TYPE={{kv_type}},KV_IP={{kv_endpoint}},OSD_DEVICE={{ item }},{{ ceph_osd_docker_extra_env }}"
|
|
||||||
volumes: "/dev/:/dev/"
|
|
||||||
with_items: ceph_osd_docker_devices
|
|
||||||
when:
|
|
||||||
- ansible_os_family != 'RedHat'
|
|
||||||
- ansible_os_family != 'CoreOS'
|
|
||||||
- osd_containerized_deployment_with_kv
|
|
||||||
|
|
Loading…
Reference in New Issue