diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-05 12:07:25 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-05 12:07:25 -0400 |
| commit | 87094cf3c43143a4501e3512dfe589d0d081df50 (patch) | |
| tree | 1728d2fd1b0dcf488d53c84f50c00d0e005c1aad /roles | |
| parent | b7104cf8e01f94f9029a0808eb9eb2c6cb6107b2 (diff) | |
| download | openshift-87094cf3c43143a4501e3512dfe589d0d081df50.tar.gz openshift-87094cf3c43143a4501e3512dfe589d0d081df50.tar.bz2 openshift-87094cf3c43143a4501e3512dfe589d0d081df50.tar.xz openshift-87094cf3c43143a4501e3512dfe589d0d081df50.zip | |
[BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 86532cd0a..858d11724 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -128,8 +128,17 @@ 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 }}" +- block: + # This is an ugly hack to verify settings are in a file without modifying them with lineinfile. + # The template file will stomp any other settings made. + - name: check whether our docker-registry setting exists in the env file + command: "awk '/^OPENSHIFT_DEFAULT_REGISTRY=\'docker-registry.default.svc:5000\'/' /etc/sysconfig/{{ openshift.common.service_type }}-master" + ignore_errors: true + changed_when: false + register: already_set + + - set_fact: + openshift_push_via_dns: "{{ (openshift_use_dnsmasq | default(true) and openshift.common.version_gte_3_6) or (already_set.stdout | match('docker-registry.default.svc:5000')) }}" - name: Install the systemd units include: systemd_units.yml |