common: switch from docker module to docker_container

As of ansible 2.4, `docker` module has been removed (was deprecated
since ansible 2.1).
We must switch to `docker_container` instead.

See: https://docs.ansible.com/ansible/latest/modules/docker_module.html#docker-module

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit d0746e0858)
pull/2812/head
Guillaume Abrioux 2018-07-09 15:50:52 +02:00 committed by Sébastien Han
parent 722e7412b6
commit f8a4c57c03
3 changed files with 15 additions and 15 deletions

View File

@ -51,7 +51,7 @@
ignore_errors: true ignore_errors: true
- name: remove ceph mds container - name: remove ceph mds container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-mds-{{ ansible_hostname }}" name: "ceph-mds-{{ ansible_hostname }}"
state: absent state: absent
@ -88,7 +88,7 @@
ignore_errors: true ignore_errors: true
- name: remove ceph mgr container - name: remove ceph mgr container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-mgr-{{ ansible_hostname }}" name: "ceph-mgr-{{ ansible_hostname }}"
state: absent state: absent
@ -135,7 +135,7 @@
ignore_errors: true ignore_errors: true
- name: remove ceph rgw container - name: remove ceph rgw container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-rgw-{{ ansible_hostname }}" name: "ceph-rgw-{{ ansible_hostname }}"
state: absent state: absent
@ -179,7 +179,7 @@
ignore_errors: true ignore_errors: true
- name: remove ceph rbd-mirror container - name: remove ceph rbd-mirror container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-rbd-mirror-{{ ansible_hostname }}" name: "ceph-rbd-mirror-{{ ansible_hostname }}"
state: absent state: absent
@ -218,7 +218,7 @@
ignore_errors: true ignore_errors: true
- name: remove ceph nfs container - name: remove ceph nfs container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-nfs-{{ ansible_hostname }}" name: "ceph-nfs-{{ ansible_hostname }}"
state: absent state: absent
@ -371,7 +371,7 @@
delay: 10 delay: 10
- name: remove ceph osd zap disk container - name: remove ceph osd zap disk container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-osd-zap-{{ ansible_hostname }}-{{ item }}" name: "ceph-osd-zap-{{ ansible_hostname }}-{{ item }}"
state: absent state: absent
@ -433,14 +433,14 @@
ignore_errors: true ignore_errors: true
- name: remove ceph mon container - name: remove ceph mon container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-mon-{{ ansible_hostname }}" name: "ceph-mon-{{ ansible_hostname }}"
state: absent state: absent
ignore_errors: true ignore_errors: true
- name: remove restapi container - name: remove restapi container
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-restapi-{{ ansible_hostname }}" name: "ceph-restapi-{{ ansible_hostname }}"
state: absent state: absent

View File

@ -1,10 +1,10 @@
--- ---
- name: populate kv_store with default ceph.conf - name: populate kv_store with default ceph.conf
docker: docker_container:
name: populate-kv-store name: populate-kv-store
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
command: populate_kvstore command: populate_kvstore
net: host network: host
env: env:
KV_TYPE: "{{kv_type}}" KV_TYPE: "{{kv_type}}"
KV_IP: "{{kv_endpoint}}" KV_IP: "{{kv_endpoint}}"
@ -16,11 +16,11 @@
- mon_containerized_default_ceph_conf_with_kv - mon_containerized_default_ceph_conf_with_kv
- name: populate kv_store with custom ceph.conf - name: populate kv_store with custom ceph.conf
docker: docker_container:
name: populate-kv-store name: populate-kv-store
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
command: populate_kvstore command: populate_kvstore
net: host network: host
env: env:
KV_TYPE: "{{kv_type}}" KV_TYPE: "{{kv_type}}"
KV_IP: "{{kv_endpoint}}" KV_IP: "{{kv_endpoint}}"
@ -34,7 +34,7 @@
- not mon_containerized_default_ceph_conf_with_kv - not mon_containerized_default_ceph_conf_with_kv
- name: delete populate-kv-store docker - name: delete populate-kv-store docker
docker: docker_container:
name: populate-kv-store name: populate-kv-store
state: absent state: absent
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"

View File

@ -1,9 +1,9 @@
--- ---
- name: run the ceph rest api docker image - name: run the ceph rest api docker image
docker: docker_container:
image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "ceph-restapi-{{ ansible_hostname }}" name: "ceph-restapi-{{ ansible_hostname }}"
net: host network: host
expose: "{{ ceph_restapi_port }}" expose: "{{ ceph_restapi_port }}"
state: running state: running
env: "RESTAPI_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_restapi_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=RESTAPI,{{ ceph_restapi_docker_extra_env }}" env: "RESTAPI_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_restapi_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=RESTAPI,{{ ceph_restapi_docker_extra_env }}"