diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-20 04:17:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 04:17:20 -0400 |
| commit | 0b0e0d1ec88af89f6315e1602b30ffe5218c88dc (patch) | |
| tree | efd967c67a1d6a33042799f512edb24820a1b074 /roles/openshift_master | |
| parent | 71496e5b9ef496ac3dec65f448ff27dcdf5c2681 (diff) | |
| parent | f62ca64ccf58b013e4c38143036b05c76ee6f80c (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.j2 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index aed5598c0..86532cd0a 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -128,6 +128,9 @@ when: openshift.master.request_header_ca is defined and item.kind == 'RequestHeaderIdentityProvider' and item.clientCA | default('') != '' with_items: "{{ openshift.master.identity_providers }}" +- set_fact: + openshift_push_via_dns: "{{ openshift_use_dnsmasq | default(true) and openshift.common.version_gte_3_6 and r_openshift_master_clean_install }}" + - name: Install the systemd units include: systemd_units.yml 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 %} |