From a892d694de10ff9316cba2d1a7414cecb924f4d5 Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Mon, 23 Jan 2017 18:50:27 -0800 Subject: [PATCH 1/2] do not use deamon anymore --- ansible/roles/local-vault/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/local-vault/tasks/main.yml b/ansible/roles/local-vault/tasks/main.yml index 1afb3dce..f745a217 100644 --- a/ansible/roles/local-vault/tasks/main.yml +++ b/ansible/roles/local-vault/tasks/main.yml @@ -11,13 +11,13 @@ - name: start vault daemon run_once: true local_action: - command daemon --pidfile=/tmp/vault.pid -- vault server --config=/tmp/vault.hcl + shell vault server --config=/tmp/vault.hcl > /tmp/log 2>&1 & echo $! > /tmp/vault.pid notify: - stop vault - name: pause for start pause: - seconds: 1 + seconds: 5 - name: check vault seal tags: [ unseal ] From 49055430bac35178b4d29b4718a9f7ebb2656ac0 Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Tue, 24 Jan 2017 14:21:24 -0800 Subject: [PATCH 2/2] fix killing --- ansible/roles/local-vault/handlers/main.yml | 2 +- ansible/roles/local-vault/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/local-vault/handlers/main.yml b/ansible/roles/local-vault/handlers/main.yml index 572ad76c..7c055ec5 100644 --- a/ansible/roles/local-vault/handlers/main.yml +++ b/ansible/roles/local-vault/handlers/main.yml @@ -1,7 +1,7 @@ --- - name: stop vault local_action: - shell kill $(cat /tmp/vault.pid) + shell kill $(ps aux | grep "vault server" | grep -v grep | cut -d' ' -f3) - name: remove vault config local_action: diff --git a/ansible/roles/local-vault/tasks/main.yml b/ansible/roles/local-vault/tasks/main.yml index f745a217..29befa21 100644 --- a/ansible/roles/local-vault/tasks/main.yml +++ b/ansible/roles/local-vault/tasks/main.yml @@ -11,7 +11,7 @@ - name: start vault daemon run_once: true local_action: - shell vault server --config=/tmp/vault.hcl > /tmp/log 2>&1 & echo $! > /tmp/vault.pid + shell vault server --config=/tmp/vault.hcl > /tmp/log 2>&1 & notify: - stop vault