summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-20 04:17:20 -0400
committerGitHub <noreply@github.com>2017-06-20 04:17:20 -0400
commit0b0e0d1ec88af89f6315e1602b30ffe5218c88dc (patch)
treeefd967c67a1d6a33042799f512edb24820a1b074 /roles/openshift_master/templates
parent71496e5b9ef496ac3dec65f448ff27dcdf5c2681 (diff)
parentf62ca64ccf58b013e4c38143036b05c76ee6f80c (diff)
downloadopenshift-0b0e0d1ec88af89f6315e1602b30ffe5218c88dc.tar.gz
openshift-0b0e0d1ec88af89f6315e1602b30ffe5218c88dc.tar.bz2
openshift-0b0e0d1ec88af89f6315e1602b30ffe5218c88dc.tar.xz
openshift-0b0e0d1ec88af89f6315e1602b30ffe5218c88dc.zip
Merge pull request #4292 from sdodson/push-via-dns
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/atomic-openshift-master.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2
index 6e2439fd9..850fae0e4 100644
--- a/roles/openshift_master/templates/atomic-openshift-master.j2
+++ b/roles/openshift_master/templates/atomic-openshift-master.j2
@@ -1,5 +1,8 @@
OPTIONS=--loglevel={{ openshift.master.debug_level | default(2) }}
CONFIG_FILE={{ openshift_master_config_file }}
+{% if openshift_push_via_dns | default(false) %}
+OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000
+{% endif %}
{% if openshift.common.is_containerized | bool %}
IMAGE_VERSION={{ openshift_image_tag }}
{% endif %}