summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Wells <josefwells@alumni.utexas.net>2019-03-01 16:19:42 -0600
committerJosef Wells <josefwells@alumni.utexas.net>2019-03-01 16:21:52 -0600
commitf72682f4772a4b88073ced489cce142c2fef0718 (patch)
tree8662c53f056ec8c64662f29b72da6f559933acb1
parentd298cb12e09d7533fbf161448cf2fc297d9fd138 (diff)
quickstart: web and others wait on mysql to start
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 04 Mar 2019 19:34:55 +0000 Reviewed-on: https://review.openstack.org/640548 Project: openstack-infra/zuul Branch: refs/heads/master
-rw-r--r--doc/source/admin/examples/docker-compose.yaml2
-rw-r--r--doc/source/admin/examples/playbooks/wait-to-start.yaml4
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/source/admin/examples/docker-compose.yaml b/doc/source/admin/examples/docker-compose.yaml
index 9b43558..1b7f8d3 100644
--- a/doc/source/admin/examples/docker-compose.yaml
+++ b/doc/source/admin/examples/docker-compose.yaml
@@ -50,7 +50,7 @@ services:
50 - "sshkey:/var/ssh:z" 50 - "sshkey:/var/ssh:z"
51 - /var/lib/zuul 51 - /var/lib/zuul
52 web: 52 web:
53 command: "zuul-web -d" 53 command: "sh -c 'ansible-playbook /var/playbooks/wait-to-start.yaml; zuul-web -d'"
54 depends_on: 54 depends_on:
55 - scheduler 55 - scheduler
56 - mysql 56 - mysql
diff --git a/doc/source/admin/examples/playbooks/wait-to-start.yaml b/doc/source/admin/examples/playbooks/wait-to-start.yaml
index 5ec5534..ac5a1e3 100644
--- a/doc/source/admin/examples/playbooks/wait-to-start.yaml
+++ b/doc/source/admin/examples/playbooks/wait-to-start.yaml
@@ -8,6 +8,10 @@
8 wait_for: 8 wait_for:
9 host: gerrit 9 host: gerrit
10 port: 29418 10 port: 29418
11 - name: Wait for mysql to start
12 wait_for:
13 host: mysql
14 port: 3306
11 - name: Wait for zuul user to be created 15 - name: Wait for zuul user to be created
12 uri: 16 uri:
13 url: http://gerrit:8080/a/accounts/zuul/sshkeys 17 url: http://gerrit:8080/a/accounts/zuul/sshkeys