From 9bb460dcf947aec01fdf02d3ef6690d609fa2b18 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Tue, 13 Jun 2017 12:30:22 -0400 Subject: 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. --- roles/openshift_master/templates/atomic-openshift-master.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_master') 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 %} -- cgit v1.2.1