From: Guillaume Abrioux Date: Wed, 10 Jan 2018 08:08:01 +0000 (+0100) Subject: defaults: rename check_socket files for containers X-Git-Tag: v3.1.0beta3~63 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=acfbebe67e06d64a72a855b0c4d5fd2ee8bce03a;p=ceph-ansible.git defaults: rename check_socket files for containers When containerized deployment, we are not looking for a socket but for a running container. Signed-off-by: Guillaume Abrioux --- diff --git a/roles/ceph-defaults/tasks/check_running_cluster.yml b/roles/ceph-defaults/tasks/check_running_cluster.yml new file mode 100644 index 000000000..b41e42f1f --- /dev/null +++ b/roles/ceph-defaults/tasks/check_running_cluster.yml @@ -0,0 +1,10 @@ +--- +- name: include check_running_containers.yml + include: check_running_containers.yml + when: + - containerized_deployment + +- name: include check_socket_non_container.yml + include: check_socket_non_container.yml + when: + - not containerized_deployment diff --git a/roles/ceph-defaults/tasks/check_running_containers.yml b/roles/ceph-defaults/tasks/check_running_containers.yml new file mode 100644 index 000000000..7c945ab46 --- /dev/null +++ b/roles/ceph-defaults/tasks/check_running_containers.yml @@ -0,0 +1,63 @@ +--- +- name: check for a mon container + command: "docker ps -q --filter='name=ceph-mon-{{ ansible_hostname }}'" + register: ceph_mon_container_stat + changed_when: false + failed_when: false + check_mode: no + when: + - inventory_hostname in groups.get(mon_group_name, []) + +- name: check for an osd container + command: "docker ps -q --filter='name=ceph-osd-{{ ansible_hostname }}'" + register: ceph_osd_container_stat + changed_when: false + failed_when: false + check_mode: no + when: + - inventory_hostname in groups.get(osd_group_name, []) + +- name: check for a mds container + command: "docker ps -q --filter='name=ceph-mds-{{ ansible_hostname }}'" + register: ceph_mds_container_stat + changed_when: false + failed_when: false + check_mode: no + when: + - inventory_hostname in groups.get(mds_group_name, []) + +- name: check for a rgw container + command: "docker ps -q --filter='name=ceph-rgw-{{ ansible_hostname }}'" + register: ceph_rgw_container_stat + changed_when: false + failed_when: false + check_mode: no + when: + - inventory_hostname in groups.get(rgw_group_name, []) + +- name: check for a mgr container + command: "docker ps -q --filter='name=ceph-mgr-{{ ansible_hostname }}'" + register: ceph_mgr_container_stat + changed_when: false + failed_when: false + check_mode: no + when: + - inventory_hostname in groups.get(mgr_group_name, []) + +- name: check for a rbd mirror container + command: "docker ps -q --filter='name=ceph-rbd-mirror-{{ ansible_hostname }}'" + register: ceph_rbd_mirror_container_stat + changed_when: false + failed_when: false + check_mode: no + when: + - inventory_hostname in groups.get(rbdmirror_group_name, []) + +- name: check for a nfs container + command: "docker ps -q --filter='name=ceph-nfs-{{ ansible_hostname }}'" + register: ceph_nfs_container_stat + changed_when: false + failed_when: false + check_mode: no + when: + - inventory_hostname in groups.get(nfs_group_name, []) diff --git a/roles/ceph-defaults/tasks/check_socket.yml b/roles/ceph-defaults/tasks/check_socket.yml deleted file mode 100644 index 37d55413b..000000000 --- a/roles/ceph-defaults/tasks/check_socket.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: include check_socket_container.yml - include: check_socket_container.yml - when: - - containerized_deployment - -- name: include check_socket_non_container.yml - include: check_socket_non_container.yml - when: - - not containerized_deployment diff --git a/roles/ceph-defaults/tasks/check_socket_container.yml b/roles/ceph-defaults/tasks/check_socket_container.yml deleted file mode 100644 index 7c945ab46..000000000 --- a/roles/ceph-defaults/tasks/check_socket_container.yml +++ /dev/null @@ -1,63 +0,0 @@ ---- -- name: check for a mon container - command: "docker ps -q --filter='name=ceph-mon-{{ ansible_hostname }}'" - register: ceph_mon_container_stat - changed_when: false - failed_when: false - check_mode: no - when: - - inventory_hostname in groups.get(mon_group_name, []) - -- name: check for an osd container - command: "docker ps -q --filter='name=ceph-osd-{{ ansible_hostname }}'" - register: ceph_osd_container_stat - changed_when: false - failed_when: false - check_mode: no - when: - - inventory_hostname in groups.get(osd_group_name, []) - -- name: check for a mds container - command: "docker ps -q --filter='name=ceph-mds-{{ ansible_hostname }}'" - register: ceph_mds_container_stat - changed_when: false - failed_when: false - check_mode: no - when: - - inventory_hostname in groups.get(mds_group_name, []) - -- name: check for a rgw container - command: "docker ps -q --filter='name=ceph-rgw-{{ ansible_hostname }}'" - register: ceph_rgw_container_stat - changed_when: false - failed_when: false - check_mode: no - when: - - inventory_hostname in groups.get(rgw_group_name, []) - -- name: check for a mgr container - command: "docker ps -q --filter='name=ceph-mgr-{{ ansible_hostname }}'" - register: ceph_mgr_container_stat - changed_when: false - failed_when: false - check_mode: no - when: - - inventory_hostname in groups.get(mgr_group_name, []) - -- name: check for a rbd mirror container - command: "docker ps -q --filter='name=ceph-rbd-mirror-{{ ansible_hostname }}'" - register: ceph_rbd_mirror_container_stat - changed_when: false - failed_when: false - check_mode: no - when: - - inventory_hostname in groups.get(rbdmirror_group_name, []) - -- name: check for a nfs container - command: "docker ps -q --filter='name=ceph-nfs-{{ ansible_hostname }}'" - register: ceph_nfs_container_stat - changed_when: false - failed_when: false - check_mode: no - when: - - inventory_hostname in groups.get(nfs_group_name, []) diff --git a/roles/ceph-defaults/tasks/main.yml b/roles/ceph-defaults/tasks/main.yml index 04abe6587..7a2b6d745 100644 --- a/roles/ceph-defaults/tasks/main.yml +++ b/roles/ceph-defaults/tasks/main.yml @@ -1,6 +1,6 @@ --- -- name: include check_socket.yml - include: check_socket.yml +- name: include check_running_cluster.yml + include: check_running_cluster.yml - name: include facts.yml include: facts.yml