Remove `sshKey` from the vault type

[github/fretlink/ansible-clever.git] / tasks / deploy.yml

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index b394e55ba85fc7e10ab0c4d78202edc92f954090..74232a627547d8a4ec0ca8eef396a580df337e28 100644 (file)
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -1,6 +1,6 @@
 - name: Configure Drain
   when: syslog_server is defined or clever_syslog_server is defined
-  command: clever-set-drain.sh
+  command: "{{ ansible_env.HOME }}/{{ clever_user_path }}/clever-set-drain.sh"
   args:
     chdir: "{{ clever_app_root }}"
   environment:
@@ -9,7 +9,7 @@
 
 - name: Configure Domain
   when: domain is defined or clever_domain is defined
-  command: clever-set-domain.sh
+  command: "{{ ansible_env.HOME }}/{{ clever_user_path }}/clever-set-domain.sh"
   args:
     chdir: "{{ clever_app_root }}"
   environment:
@@ -80,7 +80,8 @@
     - clever_deploy is failed
     - clever_deploy.stderr is defined
 
-- shell: clever activity
+- name: Retrieve clever activity
+  command: clever activity
   args:
     chdir: "{{ clever_app_root }}"
   environment:
@@ -88,12 +89,15 @@
   changed_when: false
   register: clever_activity_result
 
-- debug:
+- name: Display clever activity
+  debug:
     var: clever_activity_result.stdout_lines
 
-- shell: git show -q --format=format:%H HEAD
+- name: Get current commit sha
+  command: git show -q --format=format:%H HEAD
   args:
     chdir: "{{ clever_app_root }}"
+    warn: False
   changed_when: false
   register: current_commit_sha
 
@@ -108,10 +112,12 @@
     - clever_deploy is failed
     - clever_deploy.stderr is defined
     - clever_deploy.stderr is search("application is up-to-date")
-    - clever_activity_valid_deploy_keyword in clever_activity_result.stdout_lines[-1]
-    - current_commit_sha.stdout_lines[-1] in clever_activity_result.stdout_lines[-1]
+    - |
+      (current_commit_sha.stdout_lines[-1] not in clever_activity_result.stdout_lines[-1])
+      or
+      (clever_activity_valid_deploy_keyword not in clever_activity_result.stdout_lines[-1])
 
-- name: Fail on deployment errors
+- name: Fail on any other deployment errors
   fail:
     msg: "The clever deployment failed! Please check logs above."
   when: