From aad73ea90e134731a5325e1afcbd11a79ec07426 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Fri, 18 Nov 2016 14:08:19 -0800 Subject: [PATCH] Ensure that etcd health checks always pass in the etcd handler, the reload etcd action was called after ansible waits for etcd to be up, this means that the health checks which are called immediately after fail (resulting in the etcd role always failing and never finishing) This patch changes the order to move the 'wait for etcd up' resource after the 'reload etcd resource', ensuring that the service is up before the health check is called. --- roles/etcd/handlers/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/etcd/handlers/main.yml b/roles/etcd/handlers/main.yml index badf0bd79..4256490c9 100644 --- a/roles/etcd/handlers/main.yml +++ b/roles/etcd/handlers/main.yml @@ -10,6 +10,12 @@ command: systemctl daemon-reload when: ansible_service_mgr == "systemd" +- name: reload etcd + service: + name: etcd + state: restarted + when: is_etcd_master + - name: wait for etcd up uri: url="https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2379/health" validate_certs=no register: result @@ -17,12 +23,6 @@ retries: 10 delay: 5 -- name: reload etcd - service: - name: etcd - state: restarted - when: is_etcd_master - - name: set etcd_secret_changed set_fact: etcd_secret_changed: true