Merge "Add ability to disable intialise accounts"
diff --git a/gerrit/server/service.sls b/gerrit/server/service.sls
index 7ec4456..b8fd62f 100644
--- a/gerrit/server/service.sls
+++ b/gerrit/server/service.sls
@@ -13,7 +13,7 @@
gerrit_home:
file.directory:
- - names:
+ - names:
- {{ server.dir.home }}/.ssh
- {{ server.dir.home }}/gerrit-plugins
- {{ server.dir.site }}/bin
@@ -246,6 +246,13 @@
- require:
- service: gerrit_server_service
+gerrit_server_service_available:
+ cmd.run:
+ - name: until nc -z localhost 29418; do sleep 1; done
+ - timeout: 60
+ - require:
+ - service: gerrit_server_service
+
gerrit_server_known_host:
ssh_known_hosts.present:
- name: localhost
@@ -254,5 +261,6 @@
- hash_known_hosts: false
- require:
- file: gerrit_home
+ - cmd: gerrit_server_service_available
{%- endif %}