From bdcc52b96dc1f9c99ce490117170f644623d4846 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 2 Feb 2018 09:45:07 +0100 Subject: [PATCH] Check for docker sockets named after both _hostname or _fqdn While hostname -f will always return an hostname including its domain part and -s without the domain part, the behavior when no arguments are given can include or not include the domain part depending on how the system is configured; the socket name might not match the instance name then. --- roles/ceph-mds/tasks/containerized.yml | 2 +- roles/ceph-mon/tasks/docker/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml index 7be1b7dfd..db7fe36d1 100644 --- a/roles/ceph-mds/tasks/containerized.yml +++ b/roles/ceph-mds/tasks/containerized.yml @@ -63,7 +63,7 @@ changed_when: false - name: wait for mds socket to exist - command: "{{ docker_exec_cmd }} stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_hostname }}.asok" + command: "{{ docker_exec_cmd }} sh -c 'stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_hostname }}.asok || stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_fqdn }}.asok'" register: multi_mds_socket retries: 5 delay: 15 diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml index 638590567..842401456 100644 --- a/roles/ceph-mon/tasks/docker/main.yml +++ b/roles/ceph-mon/tasks/docker/main.yml @@ -7,7 +7,7 @@ include: start_docker_monitor.yml - name: wait for monitor socket to exist - command: docker exec ceph-mon-{{ ansible_hostname }} stat /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok + command: "docker exec ceph-mon-{{ ansible_hostname }} sh -c 'stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_hostname }}.asok || stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_fqdn }}.asok'" register: monitor_socket retries: 5 delay: 15 -- 2.39.5