diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-08-21 11:19:10 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-08-21 15:29:09 -0400 |
| commit | a7c24032fb8af51f400a5e1831273bfa135d169c (patch) | |
| tree | 5b7af0f9064416dbc30c9bd689586bdac1071ffc | |
| parent | 23da41c1fb3736b10e07774000e3a2bca028806e (diff) | |
| download | openshift-a7c24032fb8af51f400a5e1831273bfa135d169c.tar.gz openshift-a7c24032fb8af51f400a5e1831273bfa135d169c.tar.bz2 openshift-a7c24032fb8af51f400a5e1831273bfa135d169c.tar.xz openshift-a7c24032fb8af51f400a5e1831273bfa135d169c.zip | |
Adding proxy env vars for dc/docker-registry
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 8 |
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 dcd9c87fc..d6eac77fa 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -64,6 +64,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 }}" |