X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Fdeploy.yml;h=84ebe737b8bc3c6a64094c928dab841bf72141d7;hb=85d8706c5b0f5672025342f70117909177657ff1;hp=5e773b4e2b50678ee369fd09d10dfab951552341;hpb=d625a00570b54cd02f64ae6b11922ce9a7acaccf;p=github%2Ffretlink%2Fansible-clever.git diff --git a/tasks/deploy.yml b/tasks/deploy.yml index 5e773b4..84ebe73 100644 --- a/tasks/deploy.yml +++ b/tasks/deploy.yml @@ -1,15 +1,15 @@ - 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 @@ -26,11 +26,33 @@ - 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: 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 + command: "clever-wait-deploy.sh '{{ clever_app_root }}'" async: 900 poll: 0 register: long_command