commit 41500583a3fe71c81a936555b1d9391a3382cbc6
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Jul 31 14:46:38 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Tue Jul 31 14:46:38 2018 +0000
tree 3dcaad38268bcbad527272ab23565d42512d02e7
parent 0857497336725691c6419170068c1768c1297d16
parent c7e249d6b7e2e1b5abc7a662a76aa941e19ce29e

Merge "Use wait4jenkins.sh in jenkins_service_running"

jenkins/master/service.sls

diff --git a/jenkins/master/service.sls b/jenkins/master/service.sls
index 635ba17..845cff0 100644
--- a/jenkins/master/service.sls
+++ b/jenkins/master/service.sls
@@ -88,9 +88,14 @@
     - file: {{ master.home }}/hudson.model.UpdateCenter.xml
 
 jenkins_service_running:
-  cmd.wait:
-    - name: "i=0; while true; do curl -s -f http://localhost:{{ master.http.port }}/login >/dev/null && exit 0; [ $i -gt 60 ] && exit 1; sleep 5; done"
-    - watch:
-      - service: jenkins_master_service
+  cmd.script:
+  - source: salt://jenkins/files/wait4jenkins.sh
+  - shell: /bin/bash
+  - env:
+    - JENKINS_URL: "http://localhost:{{ master.http.port }}/login"
+    - WAIT_TIME: "300"
+    - INTERVAL: "5"
+  - onchanges:
+    - service: jenkins_master_service
 
 {%- endif %}