diff options
| author | Lars Wirzenius <liw@liw.fi> | 2018-04-24 14:21:48 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2018-04-24 14:21:48 +0300 |
| commit | 9fa592d2fb002f7cd62b762a0a3aab29e1c3e01d (patch) | |
| tree | 5e231a6d9008e5183858120e7d9b01c4a62fa035 /roles/ick-worker | |
| parent | 06868e8834713c93795c03372472daf3ab3759c7 (diff) | |
| download | ick2-ansible-9fa592d2fb002f7cd62b762a0a3aab29e1c3e01d.tar.gz | |
Change: support building from non-master branch of ick
Diffstat (limited to 'roles/ick-worker')
| -rw-r--r-- | roles/ick-worker/defaults/main.yml | 7 | ||||
| -rw-r--r-- | roles/ick-worker/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/ick-worker/templates/worker_manager.yaml.j2 | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/roles/ick-worker/defaults/main.yml b/roles/ick-worker/defaults/main.yml new file mode 100644 index 0000000..32a3e70 --- /dev/null +++ b/roles/ick-worker/defaults/main.yml @@ -0,0 +1,7 @@ +# Should worker manager be configured to check the TLS certificate of +# the APIs it uses? Default to yes, but if installed from CI builds, +# for testing, Let's Encrypt might not be suitable, due to limits, and +# it's necessary to use self-signed certificates, and thus it's better +# to not check certificates in that situation. + +verify_tls: yes diff --git a/roles/ick-worker/tasks/main.yml b/roles/ick-worker/tasks/main.yml index b9b351d..0e1dec4 100644 --- a/roles/ick-worker/tasks/main.yml +++ b/roles/ick-worker/tasks/main.yml @@ -2,7 +2,7 @@ apt: name: "{{ item }}" with_items: - - ick2 + - "{{ ick_prefix }}ick2" - debootstrap - jq - less diff --git a/roles/ick-worker/templates/worker_manager.yaml.j2 b/roles/ick-worker/templates/worker_manager.yaml.j2 index 11c08b2..fd1bec2 100644 --- a/roles/ick-worker/templates/worker_manager.yaml.j2 +++ b/roles/ick-worker/templates/worker_manager.yaml.j2 @@ -7,3 +7,4 @@ config: log-max: 10M log-keep: 10 workspace: /var/lib/ick/workspace + verify-tls: {{ verify_tls }} |