diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-25 17:07:57 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-06-18 21:14:29 -0400 |
| commit | 48cb038635b0508cc6c1218d3d23fb8ccd6551fe (patch) | |
| tree | ebdd765c5fc319301fe71a77b7ff54f94f68e141 /roles/openshift_master/templates | |
| parent | 9545204f504f1dcf3de18272dc1fb951dd15f486 (diff) | |
| download | openshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.tar.gz openshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.tar.bz2 openshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.tar.xz openshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.zip | |
Push to the registry via dns
Configures OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc
Adds 'cluster.local' to dns search on nodes via dispatcher script
Adds '.svc' to NO_PROXY defaults
Diffstat (limited to 'roles/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.j2 | 3 |
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..2cf784fe9 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_use_dnsmasq | default(true) %} +OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000 +{% endif %} {% if openshift.common.is_containerized | bool %} IMAGE_VERSION={{ openshift_image_tag }} {% endif %} |