X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Fdeploy.yml;h=84ebe737b8bc3c6a64094c928dab841bf72141d7;hb=85d8706c5b0f5672025342f70117909177657ff1;hp=8b98d8c5f5d6cf291145a0671d496b5f5ce45726;hpb=f7dd5848f817bb42cb06eadc5444ec390aa813ba;p=github%2Ffretlink%2Fansible-clever.git

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index 8b98d8c..84ebe73 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -1,30 +1,70 @@
 - name: Configure Drain
-  when: syslog_server is defined
+  when: syslog_server is defined or clever_syslog_server is defined
   command: clever-set-drain.sh
   environment:
-    SYSLOG_UDP_SERVER: "{{ syslog_server }}"
+    SYSLOG_UDP_SERVER: "{{ clever_syslog_server | default(syslog_server) }}"
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Configure Domain
-  when: domain is defined
+  when: domain is defined or clever_domain is defined
   command: clever-set-domain.sh
   environment:
-    DOMAIN: "{{ domain }}"
+    DOMAIN: "{{ clever_domain | default(domain) }}"
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Push Environment
   shell: "clever env import < {{ clever_app_confdir }}/env"
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
+  changed_when: false
 
 #TODO: Improve ssh-key validation
 - name: Accept Clever-Cloud servers
   shell: "ssh-keyscan -H push-par-clevercloud-customers.services.clever-cloud.com >> ~/.ssh/known_hosts"
+  tags:
+    - skip_ansible_lint
 
 - name: Push to Clever-Cloud to trigger deployment
   command: "git push --force git+ssh://git@push-par-clevercloud-customers.services.clever-cloud.com/{{ clever_app }}.git HEAD:refs/heads/master"
+  args:
+    chdir: "{{ clever_app_root }}"
+  register: clever_git_push
+  ignore_errors: true
+  tags:
+    - skip_ansible_lint
 
-- name: Wait until deployment completion
-  command: clever-wait-deploy.sh
+- name: First time push to Clever-Cloud needs a full git clone
+  command: "git fetch --unshallow"
+  args:
+    chdir: "{{ clever_app_root }}"
+  when:
+    - clever_git_push is failed
+    - clever_git_push.stderr is search("shallow update not allowed")
+  tags:
+    - skip_ansible_lint
+
+- name: Push to Clever-Cloud to trigger deployment
+  command: "git push --force git+ssh://git@push-par-clevercloud-customers.services.clever-cloud.com/{{ clever_app }}.git HEAD:refs/heads/master"
+  args:
+    chdir: "{{ clever_app_root }}"
+  when: clever_git_push is failed
+  tags:
+    - skip_ansible_lint
+
+- name: Watch deployment status
+  command: "clever-wait-deploy.sh '{{ clever_app_root }}'"
+  async: 900
+  poll: 0
+  register: long_command
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
+  changed_when: False
+
+# Waits up to 15 minutes
+- name: Wait for deployment completion
+  async_status:
+    jid: "{{ long_command.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  delay: 30
+  retries: 30