summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-02-22 13:22:19 -0800
committerJames E. Blair <jeblair@redhat.com>2019-02-22 13:22:19 -0800
commit8998838d7a86f1f10634c436479ef350a2a56bfc (patch)
tree2968e927ad40c5b5322cdec9271c33f9bffb1b62
parent5b43abfffcefa64ac1c8a6b836317245e7bd3609 (diff)
run-buildset-container: fix username/password for proxy registry
This configuration is intended to mask the creds supplied by the local docker configuration when the registry is used as a pull-through proxy to upstream. But we need to set the creds to the empty string, rather than null, which ends up as the string "None" in the docker config. Change-Id: Ic36a5c764dec8df4fa460f6735ff5668a1dd3b50
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 22 Feb 2019 21:52:44 +0000 Reviewed-on: https://review.openstack.org/638767 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/run-buildset-registry/tasks/main.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/run-buildset-registry/tasks/main.yaml b/roles/run-buildset-registry/tasks/main.yaml
index fffe2cd..0b41065 100644
--- a/roles/run-buildset-registry/tasks/main.yaml
+++ b/roles/run-buildset-registry/tasks/main.yaml
@@ -74,8 +74,8 @@
74 REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd 74 REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
75 REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm 75 REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm
76 REGISTRY_PROXY_REMOTEURL: https://registry-1.docker.io 76 REGISTRY_PROXY_REMOTEURL: https://registry-1.docker.io
77 REGISTRY_PROXY_USERNAME: 77 REGISTRY_PROXY_USERNAME: ''
78 REGISTRY_PROXY_PASSWORD: 78 REGISTRY_PROXY_PASSWORD: ''
79 volumes: 79 volumes:
80 - "{{ buildset_registry_root}}/data:/var/lib/registry" 80 - "{{ buildset_registry_root}}/data:/var/lib/registry"
81 - "{{ buildset_registry_root}}/certs:/certs" 81 - "{{ buildset_registry_root}}/certs:/certs"