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

Adding option to change kv_port anf docker tag

pull/866/head
pprokop 2016-06-28 14:02:00 +02:00
parent 6b9653c897
commit bae7e5342c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/ceph-mon/defaults/main.yml
View File

@ -69,6 +69,7 @@ ceph_mon_docker_interface: eth0
#ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface
ceph_mon_docker_username: ceph ceph_mon_docker_username: ceph
ceph_mon_docker_imagename: daemon ceph_mon_docker_imagename: daemon
ceph_osd_docker_tag: latest
ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
ceph_docker_on_openstack: false ceph_docker_on_openstack: false
mon_docker_privileged: false mon_docker_privileged: false

10
roles/ceph-mon/tasks/docker/start_docker_monitor.yml
View File

@ -2,7 +2,7 @@
- name: populate kv_store with default ceph.conf - name: populate kv_store with default ceph.conf
docker: docker:
name: populate-kv-store name: populate-kv-store
image: ceph/daemon image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
command: populate_kvstore command: populate_kvstore
net: host net: host
env: env:
@ -18,7 +18,7 @@
- name: populate kv_store with custom ceph.conf - name: populate kv_store with custom ceph.conf
docker: docker:
name: populate-kv-store name: populate-kv-store
image: ceph/daemon image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
command: populate_kvstore command: populate_kvstore
net: host net: host
env: env:
@ -37,7 +37,7 @@
docker: docker:
name: populate-kv-store name: populate-kv-store
state: absent state: absent
image: ceph/daemon image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
when: mon_containerized_deployment_with_kv when: mon_containerized_deployment_with_kv
# Use systemd to manage container on Atomic host and CoreOS # Use systemd to manage container on Atomic host and CoreOS
@ -79,7 +79,7 @@
- name: run the ceph monitor docker image - name: run the ceph monitor docker image
docker: docker:
image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}" image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
name: "{{ ansible_hostname }}" name: "{{ ansible_hostname }}"
net: "host" net: "host"
state: "running" state: "running"
@ -93,7 +93,7 @@
- name: run the ceph monitor docker image with kv - name: run the ceph monitor docker image with kv
docker: docker:
image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}" image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}"
name: "{{ ansible_hostname }}" name: "{{ ansible_hostname }}"
net: "host" net: "host"
state: "running" state: "running"

3
roles/ceph-mon/templates/ceph-mon.service.j2
View File

@ -13,6 +13,7 @@ ExecStart=/usr/bin/docker run --rm --name %i --net=host \
{% else -%} {% else -%}
-e KV_TYPE={{kv_type}} \ -e KV_TYPE={{kv_type}} \
-e KV_IP={{kv_endpoint}}\ -e KV_IP={{kv_endpoint}}\
-e KV_PORT={{kv_port}} \
{% endif -%} {% endif -%}
{% if mon_docker_privileged -%} {% if mon_docker_privileged -%}
--privileged \ --privileged \
@ -24,7 +25,7 @@ ExecStart=/usr/bin/docker run --rm --name %i --net=host \
-e MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }} \ -e MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }} \
-e CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }} \ -e CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }} \
-e MON_NAME={{ ansible_hostname }} \ -e MON_NAME={{ ansible_hostname }} \
{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }} {{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_osd_docker_tag }}
ExecStopPost=-/usr/bin/docker stop %i ExecStopPost=-/usr/bin/docker stop %i
Restart=always Restart=always
RestartSec=10s RestartSec=10s