zuul/zuul-jobs
Code Issues Proposed changes

buildset registry: fix proxy_port error in push/pull roles

Browse Source 
This was copy/pasta from the use_buildset_registry role; the
intermediate registry has no proxy_port, and the push/pull operations
don't need to use the proxy buildset registry, so remove both
entries from the docker config.

Change-Id: I7c2d57d027e457f4f093497938574624cd5a444c
This commit is contained in:
James E. Blair 2019-03-18 10:15:02 -07:00
parent f4db0f0979
commit 05d6187825
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/pull-from-intermediate-registry/tasks/main.yaml
View File

@ -44,12 +44,8 @@
{ {
"{{ intermediate_registry.host }}:{{ intermediate_registry.port }}": "{{ intermediate_registry.host }}:{{ intermediate_registry.port }}":
{"auth": "{{ (intermediate_registry.username + ":" + intermediate_registry.password) | b64encode }}"}, {"auth": "{{ (intermediate_registry.username + ":" + intermediate_registry.password) | b64encode }}"},
"{{ intermediate_registry.host }}:{{ intermediate_registry.proxy_port }}":
{"auth": "{{ (intermediate_registry.username + ":" + intermediate_registry.password) | b64encode }}"}
"{{ buildset_registry.host }}:{{ buildset_registry.port }}": "{{ buildset_registry.host }}:{{ buildset_registry.port }}":
{"auth": "{{ (buildset_registry.username + ":" + buildset_registry.password) | b64encode }}"}, {"auth": "{{ (buildset_registry.username + ":" + buildset_registry.password) | b64encode }}"},
"{{ buildset_registry.host }}:{{ buildset_registry.proxy_port }}":
{"auth": "{{ (buildset_registry.username + ":" + buildset_registry.password) | b64encode }}"}
} }
set_fact: set_fact:
new_docker_config: "{{ docker_config | combine(new_config, recursive=True) }}" new_docker_config: "{{ docker_config | combine(new_config, recursive=True) }}"

4
roles/push-to-intermediate-registry/tasks/push.yaml
View File

@ -43,12 +43,8 @@
{ {
"{{ intermediate_registry.host }}:{{ intermediate_registry.port }}": "{{ intermediate_registry.host }}:{{ intermediate_registry.port }}":
{"auth": "{{ (intermediate_registry.username + ":" + intermediate_registry.password) | b64encode }}"}, {"auth": "{{ (intermediate_registry.username + ":" + intermediate_registry.password) | b64encode }}"},
"{{ intermediate_registry.host }}:{{ intermediate_registry.proxy_port }}":
{"auth": "{{ (intermediate_registry.username + ":" + intermediate_registry.password) | b64encode }}"}
"{{ buildset_registry.host }}:{{ buildset_registry.port }}": "{{ buildset_registry.host }}:{{ buildset_registry.port }}":
{"auth": "{{ (buildset_registry.username + ":" + buildset_registry.password) | b64encode }}"}, {"auth": "{{ (buildset_registry.username + ":" + buildset_registry.password) | b64encode }}"},
"{{ buildset_registry.host }}:{{ buildset_registry.proxy_port }}":
{"auth": "{{ (buildset_registry.username + ":" + buildset_registry.password) | b64encode }}"}
} }
set_fact: set_fact:
new_docker_config: "{{ docker_config | combine(new_config, recursive=True) }}" new_docker_config: "{{ docker_config | combine(new_config, recursive=True) }}"