diff options
| author | Matt Hart <matthew.hart@linaro.org> | 2015-12-03 17:49:08 +0000 |
|---|---|---|
| committer | Matt Hart <matthew.hart@linaro.org> | 2015-12-03 17:49:08 +0000 |
| commit | cd5aec5916f8e6d350b4ce8fae31fd0493cfe6a5 (patch) | |
| tree | 1a60c9d0923a14cda5d2517b0217def84a785261 | |
| parent | d56eaff0b399b5bc98f68366ae4dd02351cc47ef (diff) | |
Move gerrit key sync cronlogic into gerrit-setup
Change-Id: I58468bd3db508ed342f7955d0e658d0f8761015b
| -rw-r--r-- | per-service/git-servers/roles/cronjobs/tasks/main.yml | 11 | ||||
| -rw-r--r-- | per-service/git-servers/roles/gerrit-setup/tasks/deps.yml | 11 | ||||
| -rw-r--r-- | per-service/git-servers/roles/gerrit-setup/templates/ldapkeyscron (renamed from per-service/git-servers/roles/cronjobs/templates/gerrit) | 0 |
3 files changed, 11 insertions, 11 deletions
diff --git a/per-service/git-servers/roles/cronjobs/tasks/main.yml b/per-service/git-servers/roles/cronjobs/tasks/main.yml index 58a8bd4c..cc845705 100644 --- a/per-service/git-servers/roles/cronjobs/tasks/main.yml +++ b/per-service/git-servers/roles/cronjobs/tasks/main.yml @@ -14,17 +14,6 @@ - android - git -- name: Install gerrit crontab - template: src=gerrit dest=/etc/cron.d/gerrit - owner=root - group=root - mode=0644 - when: hosttype == "git-review" - tags: - - cron - - install - - update - # # Note: It's assumed that choices below are exlcusive - particular # service will either want to whitelist or blacklist some projects 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 a2c0a721..3d62065f 100644 --- a/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml +++ b/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml @@ -30,3 +30,14 @@ owner={{ git_user }} group={{ git_user }} mode=0755 + +- name: Install gerrit LDAP Keys sync crontab + template: src=ldapkeyscron dest=/etc/cron.d/gerrit-sync-keys + owner=root + group=root + mode=0644 + when: hosttype == "git-review" + tags: + - cron + - install + - update diff --git a/per-service/git-servers/roles/cronjobs/templates/gerrit b/per-service/git-servers/roles/gerrit-setup/templates/ldapkeyscron index 8aa269c0..8aa269c0 100644 --- a/per-service/git-servers/roles/cronjobs/templates/gerrit +++ b/per-service/git-servers/roles/gerrit-setup/templates/ldapkeyscron |