diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-13 12:30:22 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-06-18 21:14:29 -0400 |
| commit | 9bb460dcf947aec01fdf02d3ef6690d609fa2b18 (patch) | |
| tree | 55fe0368a444a21d80920672aa65c2e16374ac13 /roles/openshift_master | |
| parent | 7ec50feb584e45359fd21d9c78635aae9a995a18 (diff) | |
| download | openshift-9bb460dcf947aec01fdf02d3ef6690d609fa2b18.tar.gz openshift-9bb460dcf947aec01fdf02d3ef6690d609fa2b18.tar.bz2 openshift-9bb460dcf947aec01fdf02d3ef6690d609fa2b18.tar.xz openshift-9bb460dcf947aec01fdf02d3ef6690d609fa2b18.zip | |
Disable actually pushing to the registry via dns for now
We need to sort out how to know that the registry certificate has the
proper hostnames attached to it. It will for 3.6 clean installs but not
for 3.5 to 3.6 upgrades. For now make it opt in and come back to
this.
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index 2cf784fe9..6c9e1336a 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -1,6 +1,6 @@ OPTIONS=--loglevel={{ openshift.master.debug_level | default(2) }} CONFIG_FILE={{ openshift_master_config_file }} -{% if openshift_use_dnsmasq | default(true) %} +{% if openshift_use_dnsmasq | default(true) and openshift_push_via_dns | default(false) %} OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000 {% endif %} {% if openshift.common.is_containerized | bool %} |