summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorBen Copeland <ben.copeland@linaro.org>2016-11-07 11:56:24 +0000
committerBen Copeland <ben.copeland@linaro.org>2016-11-07 15:26:05 +0000
commite630dc1f17db754b772a90f9a00d80d12502a455 (patch)
tree5447c2ac0979f26ca608cbcf303e2e159ec1b6bc /per-service
parenteb4c0b563f3ad3312cf088d07f5ce2dc2507bdcd (diff)
downloadansible-playbooks-e630dc1f17db754b772a90f9a00d80d12502a455.tar.gz
gerrit: fix playbook ordering
Due to the current ordering, a fresh deployment of gerrit fails due to not being able to enable proxy_http. Change-Id: I7d0c0ccdc071de3e5958ede871f67492feec2786 Reviewed-on: https://review.linaro.org/15338 Reviewed-by: Andy Doan <andy.doan@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/gerrit.yml4
-rw-r--r--per-service/git-servers/roles/gerrit-setup/tasks/deps.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/per-service/git-servers/gerrit.yml b/per-service/git-servers/gerrit.yml
index 219b04d..55d0388 100644
--- a/per-service/git-servers/gerrit.yml
+++ b/per-service/git-servers/gerrit.yml
@@ -14,11 +14,11 @@
# TODO: "apache-website" role written mostly for git part of service, split out
# any useful generic bits still
# - apache-website
+ - postgres
+ - gerrit-setup
- {role: apache-site, src: "{{gerrit_host}}.conf", config: "{{gerrit_host}}", tags: [apache, website-conf] }
- apache-conf
- {role: apache-auth, host_name: "{{gerrit_host}}", when: server_access == "private", tags: [apache-auth, website-conf]}
- - postgres
- - gerrit-setup
- gerrit-theme
- gerrit-hooks
- gerrit-bot-user
diff --git a/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml b/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml
index c27af63..912d565 100644
--- a/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml
+++ b/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml
@@ -11,7 +11,7 @@
- update
- name: Install Apache modules to support Gerrit
- command: a2enmod {{item}} creates=/etc/apache2/mods-enabled/{{item}}.load
+ apache2_module: name={{item}}
with_items:
- proxy
- proxy_http