From 05d61878250cf1a42373654482ee699974d84501 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 18 Mar 2019 10:15:02 -0700 Subject: [PATCH] buildset registry: fix proxy_port error in push/pull roles 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 --- roles/pull-from-intermediate-registry/tasks/main.yaml | 4 ---- roles/push-to-intermediate-registry/tasks/push.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/roles/pull-from-intermediate-registry/tasks/main.yaml b/roles/pull-from-intermediate-registry/tasks/main.yaml index 4f9078284..c143b1a06 100644 --- a/roles/pull-from-intermediate-registry/tasks/main.yaml +++ b/roles/pull-from-intermediate-registry/tasks/main.yaml @@ -44,12 +44,8 @@ { "{{ intermediate_registry.host }}:{{ intermediate_registry.port }}": {"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 }}": {"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: new_docker_config: "{{ docker_config | combine(new_config, recursive=True) }}" diff --git a/roles/push-to-intermediate-registry/tasks/push.yaml b/roles/push-to-intermediate-registry/tasks/push.yaml index bfb08f958..36498ff07 100644 --- a/roles/push-to-intermediate-registry/tasks/push.yaml +++ b/roles/push-to-intermediate-registry/tasks/push.yaml @@ -43,12 +43,8 @@ { "{{ intermediate_registry.host }}:{{ intermediate_registry.port }}": {"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 }}": {"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: new_docker_config: "{{ docker_config | combine(new_config, recursive=True) }}"