mirror of https://github.com/ceph/ceph-ansible.git
docker: make ceph docker osd script path
Since distro will not allow /usr/share to be writable (e.g: atomic) so we let the operator decide where to put that script. Signed-off-by: Sébastien Han <seb@redhat.com>pull/1287/head
parent
7b216aa8e0
commit
b91d227b99
|
@ -193,4 +193,5 @@ dummy:
|
||||||
#ceph_osd_docker_devices: "{{ devices }}"
|
#ceph_osd_docker_devices: "{{ devices }}"
|
||||||
#ceph_docker_on_openstack: false
|
#ceph_docker_on_openstack: false
|
||||||
#ceph_config_keys: [] # DON'T TOUCH ME
|
#ceph_config_keys: [] # DON'T TOUCH ME
|
||||||
|
#ceph_osd_docker_run_script_path: "/usr/share"
|
||||||
|
|
||||||
|
|
|
@ -185,3 +185,4 @@ ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK
|
||||||
ceph_osd_docker_devices: "{{ devices }}"
|
ceph_osd_docker_devices: "{{ devices }}"
|
||||||
ceph_docker_on_openstack: false
|
ceph_docker_on_openstack: false
|
||||||
ceph_config_keys: [] # DON'T TOUCH ME
|
ceph_config_keys: [] # DON'T TOUCH ME
|
||||||
|
ceph_osd_docker_run_script_path: "/usr/share"
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
become: true
|
become: true
|
||||||
template:
|
template:
|
||||||
src: "{{ role_path }}/templates/ceph-osd-run.sh.j2"
|
src: "{{ role_path }}/templates/ceph-osd-run.sh.j2"
|
||||||
dest: /usr/share/ceph-osd-run.sh
|
dest: "{{ ceph_osd_docker_run_script_path }}/ceph-osd-run.sh"
|
||||||
owner: "root"
|
owner: "root"
|
||||||
group: "root"
|
group: "root"
|
||||||
mode: "0744"
|
mode: "0744"
|
||||||
|
|
|
@ -7,7 +7,7 @@ After=docker.service
|
||||||
EnvironmentFile=-/etc/environment
|
EnvironmentFile=-/etc/environment
|
||||||
ExecStartPre=-/usr/bin/docker stop {{ ansible_hostname }}-osd-dev%i
|
ExecStartPre=-/usr/bin/docker stop {{ ansible_hostname }}-osd-dev%i
|
||||||
ExecStartPre=-/usr/bin/docker rm -f {{ ansible_hostname }}-osd-dev%i
|
ExecStartPre=-/usr/bin/docker rm -f {{ ansible_hostname }}-osd-dev%i
|
||||||
ExecStart=/usr/share/ceph-osd-run.sh %i
|
ExecStart={{ ceph_osd_docker_run_script_path }}/ceph-osd-run.sh %i
|
||||||
ExecStop=-/usr/bin/docker stop {{ ansible_hostname }}-osd-dev%i
|
ExecStop=-/usr/bin/docker stop {{ ansible_hostname }}-osd-dev%i
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=10s
|
RestartSec=10s
|
||||||
|
|
|
@ -21,3 +21,4 @@ ceph_osd_docker_devices: "{{ devices }}"
|
||||||
devices:
|
devices:
|
||||||
- /dev/sda
|
- /dev/sda
|
||||||
- /dev/sdb
|
- /dev/sdb
|
||||||
|
ceph_osd_docker_run_script_path: /var/tmp
|
||||||
|
|
Loading…
Reference in New Issue