diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-03 11:06:18 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-05 10:30:53 -0400 |
| commit | 09e74fa8f619038ea06723392ce0d620ffbc6d3a (patch) | |
| tree | e3c17249a47ed0d70c99c22ef8f8426655a83245 /roles/openshift_hosted | |
| parent | 7b5c476ecd2e6d3cf26bea294e5b7c141d061384 (diff) | |
| parent | 0d0f54af3a02cd0e228210dfae95806d4e644c3b (diff) | |
| download | openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.gz openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.bz2 openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.xz openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.zip | |
Merge branch 'master' into encryption
Diffstat (limited to 'roles/openshift_hosted')
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index 2eeb2e7ce..b946ec8ca 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -56,6 +56,11 @@ openshift_hosted_registry_force: - False +- name: Update registry environment variables when pushing via dns + set_fact: + 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: Create the registry service account oc_serviceaccount: name: "{{ openshift_hosted_registry_serviceaccount }}" |