diff options
| author | Benjamin Copeland <ben.copeland@linaro.org> | 2019-01-07 19:59:13 +0000 |
|---|---|---|
| committer | Benjamin Copeland <ben.copeland@linaro.org> | 2019-01-11 11:42:46 +0000 |
| commit | 6e28559d462d858ae622b78615ca5c19930832a0 (patch) | |
| tree | 3aa4eeb005fe9b2180fb242adaf18c2cb1734645 | |
| parent | c86e8420b467a775638f279948993c5175aa3dcd (diff) | |
grimoirelab: Add support for secrets dir
This is needed so we can get Gerrit stats.
Change-Id: I69821cacdd7b5151ca5a0d8e3187e8959a73fce3
Reviewed-on: https://review.linaro.org/29678
Reviewed-by: Kelley Spoon <kelley.spoon@linaro.org>
Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
| -rw-r--r-- | roles/docker-grimoirelab/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/docker-grimoirelab/tasks/main.yml | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/roles/docker-grimoirelab/defaults/main.yml b/roles/docker-grimoirelab/defaults/main.yml index 6b4710c1..2ebc695d 100644 --- a/roles/docker-grimoirelab/defaults/main.yml +++ b/roles/docker-grimoirelab/defaults/main.yml @@ -10,8 +10,10 @@ docker_mordred_infra: "{{grimoirelab_root}}/infra.cfg" docker_mordred_projects: "{{grimoirelab_root}}/projects.json" docker_grimoirelab_identities: "{{grimoirelab_root}}/identities.yaml" docker_grimoirelab_orgs: "{{grimoirelab_root}}/orgs.json" - docker_grimoirelab_logs: "{{grimoirelab_root}}/logs" +docker_grimoirelab_user_dir_ssh: "{{grimoirelab_root}}/secrets/grimoirelab/ssh" + +docker_grimoirelab_secrets: "{{secrets_dir}}/files/grimoirelab" # MariaDB docker_image_mariadb: mariadb:10.1 @@ -20,6 +22,6 @@ docker_container_name_mariadb: grimoirelab-db docker_mariadb_data: "{{grimoirelab_root}}/mysql" # Kibiter -docker_image_kibiter: bitergia/kibiter:optimized-v6.1.4-2 +docker_image_kibiter: bitergia/kibiter:community-v6.1.4-2 docker_container_name_kibiter: grimoirelab-kibiter docker_port_kibiter: 5602 diff --git a/roles/docker-grimoirelab/tasks/main.yml b/roles/docker-grimoirelab/tasks/main.yml index 623ee870..b2073767 100644 --- a/roles/docker-grimoirelab/tasks/main.yml +++ b/roles/docker-grimoirelab/tasks/main.yml @@ -37,6 +37,12 @@ links: - "elk-production:elk" +- name: Ensure secrets dir exists + copy: + src: "{{docker_grimoirelab_secrets}}" + dest: "{{grimoirelab_root}}/secrets" + mode: 0600 + - name: Create docker grimoirelab container docker_container: name: "{{docker_container_name_grimoirelab}}" @@ -56,6 +62,7 @@ - "{{docker_grimoirelab_identities}}:/identities.yaml" - "{{docker_grimoirelab_orgs}}:/orgs.json" - "{{docker_grimoirelab_logs}}:/logs" + - "{{docker_grimoirelab_user_dir_ssh}}:/home/grimoirelab/.ssh" - name: Wait for docker to start wait_for: |