summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-02-18 10:29:05 -0800
committerJames E. Blair <jeblair@redhat.com>2019-02-18 10:46:26 -0800
commitc58e2a51dcd733277b715943c6740d3fe6fc877c (patch)
treec781ebba075782a2d7beb8c7849e541257a22f75
parent71b7cb0ae5af1c824e369eb8690862aac7d38e5c (diff)
Load buildset_registry in intermediate pull
The intermediate registry pull role is designed to be used in the same playbook as the run-buildset-registry role, which sets the buildset_registry fact. However, that fact is set on the host where the registry runs, not localhost. Theoretically we should be able to delegate setting that fact to all hosts in the inventory, plus localhost, however, that doesn't seem to work in local testing. Work around this by, once again, loading the buildset_registry fact from the zuul_return file. Change-Id: Ia16b3af8782c875e64ad5eeeeb5f107482a3e30a
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Workflow+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 18 Feb 2019 19:43:12 +0000 Reviewed-on: https://review.openstack.org/637603 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/pull-from-intermediate-registry/tasks/main.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/roles/pull-from-intermediate-registry/tasks/main.yaml b/roles/pull-from-intermediate-registry/tasks/main.yaml
index dabe367..b787eb9 100644
--- a/roles/pull-from-intermediate-registry/tasks/main.yaml
+++ b/roles/pull-from-intermediate-registry/tasks/main.yaml
@@ -1,3 +1,12 @@
1# This can be removed if we add this functionality to Zuul directly
2- name: Load information from zuul_return
3 when: buildset_registry is not defined
4 set_fact:
5 buildset_registry: "{{ (lookup('file', zuul.executor.work_root + '/results.json') | from_json)['buildset_registry'] }}"
6- name: Ensure registry cert directory exists
7 file:
8 path: "/etc/docker/certs.d/{{ buildset_registry.host }}:{{ buildset_registry.port }}/"
9 state: directory
1- name: Ensure registry cert directory exists 10- name: Ensure registry cert directory exists
2 file: 11 file:
3 path: "/etc/docker/certs.d/{{ buildset_registry.host }}:{{ buildset_registry.port }}/" 12 path: "/etc/docker/certs.d/{{ buildset_registry.host }}:{{ buildset_registry.port }}/"