Updating healthcheck syntax and making retries NOT configurable

due to ansible bug ansible/ansible#5865
modcloth · Dec 10, 2014 · ebb684e · ebb684e
1 parent 7a39ba4
commit ebb684e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ modcloth_app_healthcheck_host: "{{ ansible_fqdn }}"
 modcloth_app_healthcheck_url: "{{ modcloth_app_healthcheck_scheme }}://{{ modcloth_app_healthcheck_host }}:{{ modcloth_app_healthcheck_port }}/{{ modcloth_app_healthcheck_path }}"
 modcloth_app_healthcheck_timeout: 1
 modcloth_app_healthcheck_delay: 1
-modcloth_app_healthcheck_retries: 30
+# modcloth_app_healthcheck_retries: 30 # currently not configurable due to https://github.com/ansible/ansible/issues/5865
 ```
 
 ## External Dependency Variables

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -95,7 +95,7 @@ modcloth_app_healthcheck_host: "{{ ansible_fqdn }}"
 modcloth_app_healthcheck_url: "{{ modcloth_app_healthcheck_scheme }}://{{ modcloth_app_healthcheck_host }}:{{ modcloth_app_healthcheck_port }}/{{ modcloth_app_healthcheck_path }}"
 modcloth_app_healthcheck_timeout: 1
 modcloth_app_healthcheck_delay: 1
-modcloth_app_healthcheck_retries: 30
+# modcloth_app_healthcheck_retries: 30 # currently not configurable due to https://github.com/ansible/ansible/issues/5865
 
 # External dependency variables
 

diff --git a/tasks/wait-healthcheck.yml b/tasks/wait-healthcheck.yml
@@ -8,7 +8,7 @@
     url: "{{ modcloth_app_healthcheck_url }}"
     timeout: "{{ modcloth_app_healthcheck_timeout }}"
   register: result
-  retries: "{{ modcloth_app_healthcheck_retries }}"
-  delay: "{{ modcloth_app_healthcheck_delay }}"
-  until: result.status < 400 and result.status >= 200
+  retries: 30 # currently not configurable due to https://github.com/ansible/ansible/issues/5865
+  delay:  "{{ modcloth_app_healthcheck_delay|int }}"
+  until: result.status is defined and result.status < 400 and result.status >= 200
   when: modcloth_app_healthcheck_enabled|bool