summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-06 15:21:16 -0400
committerGitHub <noreply@github.com>2017-09-06 15:21:16 -0400
commitbb7502b5c22a0af691c552c1c86a4d4b1fb6b0bc (patch)
tree46bc07502c60818359ee4a217ef6d8d4258710e8
parent9453ee0fe87cea7e8e40a5a932793cbcbf0d6506 (diff)
parenta7c24032fb8af51f400a5e1831273bfa135d169c (diff)
downloadopenshift-bb7502b5c22a0af691c552c1c86a4d4b1fb6b0bc.tar.gz
openshift-bb7502b5c22a0af691c552c1c86a4d4b1fb6b0bc.tar.bz2
openshift-bb7502b5c22a0af691c552c1c86a4d4b1fb6b0bc.tar.xz
openshift-bb7502b5c22a0af691c552c1c86a4d4b1fb6b0bc.zip
Merge pull request #5148 from kwoodson/registry_proxy_updates
Merged by openshift-bot
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index 3e424da12..d73c290ff 100644
--- a/roles/openshift_hosted/tasks/registry/registry.yml
+++ b/roles/openshift_hosted/tasks/registry/registry.yml
@@ -61,6 +61,14 @@
openshift_hosted_registry_env_vars: "{{ openshift_hosted_registry_env_vars | combine({'OPENSHIFT_DEFAULT_REGISTRY':'docker-registry.default.svc:5000'}) }}"
when: openshift_push_via_dns | default(false) | bool
+- name: Update registry proxy settings for dc/docker-registry
+ set_fact:
+ openshift_hosted_registry_env_vars: "{{ {'HTTPS_PROXY': (openshift.common.https_proxy | default('')),
+ 'HTTP_PROXY': (openshift.common.http_proxy | default('')),
+ 'NO_PROXY': (openshift.common.no_proxy | default(''))}
+ | combine(openshift_hosted_registry_env_vars) }}"
+ when: (openshift.common.https_proxy | default(False)) or (openshift.common.http_proxy | default('')) != ''
+
- name: Create the registry service account
oc_serviceaccount:
name: "{{ openshift_hosted_registry_serviceaccount }}"