diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-06 07:55:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 07:55:16 -0400 |
| commit | 137926057549032a69150fccb2ff6b5936b39161 (patch) | |
| tree | 0b3a51e7eb5e6eff62aa4bf189e5a3f7544066f4 | |
| parent | cd578ccdb6cced49fde252077e135288d20f8e2a (diff) | |
| parent | 812e6695208dfb3f29b2c95c7814c2c007022f30 (diff) | |
| download | openshift-137926057549032a69150fccb2ff6b5936b39161.tar.gz openshift-137926057549032a69150fccb2ff6b5936b39161.tar.bz2 openshift-137926057549032a69150fccb2ff6b5936b39161.tar.xz openshift-137926057549032a69150fccb2ff6b5936b39161.zip | |
Merge pull request #4681 from kwoodson/default_registry_env_fix
[BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting in env file.
| -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..a6b512341 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('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" - name: Install the systemd units include: systemd_units.yml |